Skip to content

Commit 06aeeaa

Browse files
emjay0921emjay0921
committed
[FIX] pre-commit
1 parent 69fcf7e commit 06aeeaa

3 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎spp_custom_field/models/cus_partner.py‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ def _get_view(self, view_id=None, view_type="form", **options): # noqa: C901
144144
# Process custom fields with grouping
145145
if custom_fields:
146146
grouped_custom_fields = self._group_fields_by_group(custom_fields)
147-
147+
148148
# Create main container row for side-by-side layout
149149
main_row = etree.SubElement(custom_page, "div", {"class": "row"})
150-
150+
151151
for group_record, fields_in_group in grouped_custom_fields:
152152
if group_record:
153153
# Create a half-width column for each group
@@ -168,20 +168,14 @@ def _get_view(self, view_id=None, view_type="form", **options): # noqa: C901
168168
)
169169
group_label.text = group_record.name
170170
# Create fields container
171-
group_div = etree.SubElement(
172-
group_col, "div", {"class": "row mt16 o_settings_container"}
173-
)
171+
group_div = etree.SubElement(group_col, "div", {"class": "row mt16 o_settings_container"})
174172
for field in fields_in_group:
175173
self.create_field_element(group_div, field)
176174
else:
177175
# Fields without a group go in full width at the bottom
178-
if not custom_page.xpath(
179-
".//div[@class='row mt16 o_settings_container o_no_group']"
180-
):
176+
if not custom_page.xpath(".//div[@class='row mt16 o_settings_container o_no_group']"):
181177
custom_div = etree.SubElement(
182-
custom_page,
183-
"div",
184-
{"class": "row mt16 o_settings_container o_no_group"}
178+
custom_page, "div", {"class": "row mt16 o_settings_container o_no_group"}
185179
)
186180
else:
187181
custom_div = custom_page.xpath(
@@ -193,10 +187,10 @@ def _get_view(self, view_id=None, view_type="form", **options): # noqa: C901
193187
# Process indicator fields with grouping
194188
if indicator_fields:
195189
grouped_indicator_fields = self._group_fields_by_group(indicator_fields)
196-
190+
197191
# Create main container row for side-by-side layout
198192
main_row = etree.SubElement(indicators_page, "div", {"class": "row"})
199-
193+
200194
for group_record, fields_in_group in grouped_indicator_fields:
201195
if group_record:
202196
# Create a half-width column for each group
@@ -217,20 +211,14 @@ def _get_view(self, view_id=None, view_type="form", **options): # noqa: C901
217211
)
218212
group_label.text = group_record.name
219213
# Create fields container
220-
group_div = etree.SubElement(
221-
group_col, "div", {"class": "row mt16 o_settings_container"}
222-
)
214+
group_div = etree.SubElement(group_col, "div", {"class": "row mt16 o_settings_container"})
223215
for field in fields_in_group:
224216
self.create_field_element(group_div, field, is_ind=True)
225217
else:
226218
# Fields without a group go in full width at the bottom
227-
if not indicators_page.xpath(
228-
".//div[@class='row mt16 o_settings_container o_no_group']"
229-
):
219+
if not indicators_page.xpath(".//div[@class='row mt16 o_settings_container o_no_group']"):
230220
indicators_div = etree.SubElement(
231-
indicators_page,
232-
"div",
233-
{"class": "row mt16 o_settings_container o_no_group"}
221+
indicators_page, "div", {"class": "row mt16 o_settings_container o_no_group"}
234222
)
235223
else:
236224
indicators_div = indicators_page.xpath(

‎spp_custom_field/views/field_group_views.xml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,23 @@
4747
<search>
4848
<field name="name" />
4949
<field name="target_type" />
50-
<separator/>
51-
<filter string="Group Fields" name="filter_group" domain="[('target_type', '=', 'grp')]"/>
52-
<filter string="Individual Fields" name="filter_individual" domain="[('target_type', '=', 'indv')]"/>
53-
<separator/>
54-
<filter string="Active" name="filter_active" domain="[('active', '=', True)]"/>
55-
<filter string="Archived" name="filter_archived" domain="[('active', '=', False)]"/>
56-
<separator/>
50+
<separator />
51+
<filter string="Group Fields" name="filter_group" domain="[('target_type', '=', 'grp')]" />
52+
<filter
53+
string="Individual Fields"
54+
name="filter_individual"
55+
domain="[('target_type', '=', 'indv')]"
56+
/>
57+
<separator />
58+
<filter string="Active" name="filter_active" domain="[('active', '=', True)]" />
59+
<filter string="Archived" name="filter_archived" domain="[('active', '=', False)]" />
60+
<separator />
5761
<group expand="1" string="Group By">
58-
<filter string="Target Type" name="group_by_target_type" context="{'group_by': 'target_type'}"/>
62+
<filter
63+
string="Target Type"
64+
name="group_by_target_type"
65+
context="{'group_by': 'target_type'}"
66+
/>
5967
</group>
6068
</search>
6169
</field>
@@ -66,7 +74,7 @@
6674
<field name="name">Field Groups</field>
6775
<field name="res_model">spp.custom.field.group</field>
6876
<field name="view_mode">tree,form</field>
69-
<field name="search_view_id" ref="view_field_group_search"/>
77+
<field name="search_view_id" ref="view_field_group_search" />
7078
<field name="context">{'search_default_filter_active': 1}</field>
7179
<field name="help" type="html">
7280
<p class="o_view_nocontent_smiling_face">

‎spp_custom_fields_ui/views/custom_fields_ui.xml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,15 @@
253253
<field name="res_model">ir.model.fields</field>
254254
<field name="view_mode">tree,form</field>
255255
<field name="search_view_id" ref="view_custom_fields_ui_search" />
256-
<field name="context" eval="{
256+
<field
257+
name="context"
258+
eval="{
257259
'default_model_id': ref('base.model_res_partner'),
258260
'default_model': 'res.partner',
259261
'default_target_type': 'grp',
260262
'search_default_group_by_field_group': 1,
261-
}"/>
263+
}"
264+
/>
262265
<field
263266
name="domain"
264267
eval="[('model_id', '=', ref('base.model_res_partner')), ('state', '=', 'manual'), ('target_type', '=', 'grp')]"
@@ -286,12 +289,15 @@
286289
<field name="res_model">ir.model.fields</field>
287290
<field name="view_mode">tree,form</field>
288291
<field name="search_view_id" ref="view_custom_fields_ui_search" />
289-
<field name="context" eval="{
292+
<field
293+
name="context"
294+
eval="{
290295
'default_model_id': ref('base.model_res_partner'),
291296
'default_model': 'res.partner',
292297
'default_target_type': 'indv',
293298
'search_default_group_by_field_group': 1,
294-
}"/>
299+
}"
300+
/>
295301
<field
296302
name="domain"
297303
eval="[('model_id', '=', ref('base.model_res_partner')), ('state', '=', 'manual'), ('target_type', '=', 'indv')]"
@@ -343,12 +349,12 @@
343349
/>
344350

345351
<!-- Move Field Groups menu under Custom Fields parent -->
346-
<menuitem
347-
id="spp_custom_field.menu_field_group"
352+
<menuitem
353+
id="spp_custom_field.menu_field_group"
348354
name="Field Groups"
349-
parent="menu_custom_fields_ui_root"
350-
sequence="30"
351-
groups="g2p_registry_base.group_g2p_admin"
355+
parent="menu_custom_fields_ui_root"
356+
sequence="30"
357+
groups="g2p_registry_base.group_g2p_admin"
352358
/>
353359

354360
</odoo>

0 commit comments

Comments
 (0)