Skip to content

Commit a72ada0

Browse files
gonzalesedwin1123gonzalesedwin1123
authored
Merge pull request #59 from OpenSPP/fix/restore-readonly-disabled-fields
fix(registry,programs): restore readonly=disabled and editable lists broken by lint
2 parents 2a25b61 + f8c969e commit a72ada0

6 files changed

Lines changed: 41 additions & 34 deletions

File tree

‎.openspp-lint.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ rules:
7676
- "entitlement_manager_ids" # Entitlement managers (typically <10 per program)
7777
- "payment_manager_ids" # Payment managers (typically <10 per program)
7878
- "farm_machinery_ids" # Farm machinery (typically <20 per farm)
79+
- "group_membership_ids" # Group members (editable from registrant form)
80+
- "individual_membership_ids" # Individual memberships (editable from registrant form)
81+
- "reg_ids" # Registrant IDs (editable from registrant form)
82+
- "related_1_ids" # Relationships (editable from registrant form)
83+
- "related_2_ids" # Relationships (editable from registrant form)
84+
- "beneficiary_ids" # Duplicate beneficiaries (editable from duplicate form)
7985

8086
# Severity overrides (change default severity for rules)
8187
# Valid values: error, warning, info

‎spp_programs/views/duplicate_view.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
4747
</div>
4848
<notebook>
4949
<page string="Beneficiaries">
50-
<field
51-
name="beneficiary_ids"
52-
nolabel="1"
53-
colspan="2"
54-
readonly="1"
55-
>
56-
<list delete="0">
50+
<field name="beneficiary_ids" nolabel="1" colspan="2">
51+
<list delete="0" editable="bottom">
5752
<button
5853
name="open_registrant_form"
5954
type="object"

‎spp_programs/views/program_membership_view.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
218218
</field>
219219
</page>
220220
<page string="IDs" name="ids">
221-
<field name="reg_ids" nolabel="1" colspan="2" readonly="1">
222-
<list>
221+
<field name="reg_ids" nolabel="1" colspan="2">
222+
<list editable="bottom">
223223
<field name="id_type_id" />
224224
<field name="value" string="ID Number" />
225225
<field name="expiry_date" />
@@ -228,13 +228,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
228228
</page>
229229
<page string="Relationships" name="relationships">
230230
<group string="Registrant is related to:">
231-
<field
232-
name="related_1_ids"
233-
nolabel="1"
234-
colspan="2"
235-
readonly="1"
236-
>
237-
<list>
231+
<field name="related_1_ids" nolabel="1" colspan="2">
232+
<list editable="bottom">
238233
<field
239234
name="source"
240235
domain="[('is_registrant','=',True),('id','!=',id)]"
@@ -318,9 +313,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
318313
name="individual_membership_ids"
319314
nolabel="1"
320315
colspan="2"
321-
readonly="1"
322316
>
323-
<list>
317+
<list editable="bottom">
324318
<field
325319
name="group"
326320
domain="[('is_registrant','=',True),('is_group','=',True)]"

‎spp_registry/views/group_membership_views.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</xpath>
1515
<xpath expr="//div[@name='group_members_section']" position="inside">
1616
<separator string="Group Members" />
17-
<field name="group_membership_ids" readonly="1" nolabel="1">
18-
<list default_order='status asc,ended_date asc'>
17+
<field name="group_membership_ids" readonly="disabled" nolabel="1">
18+
<list editable="top" default_order='status asc,ended_date asc'>
1919
<button
2020
name="open_individual_form"
2121
type="object"

‎spp_registry/views/individual_membership_views.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</xpath>
1515
<xpath expr="//div[@name='membership_section']" position="inside">
1616
<separator string="Group Membership" />
17-
<field name="individual_membership_ids" readonly="1" nolabel="1">
18-
<list>
17+
<field name="individual_membership_ids" readonly="disabled" nolabel="1">
18+
<list editable="top">
1919
<button
2020
name="open_group_form"
2121
type="object"

‎spp_registry/views/individual_views.xml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,11 @@
375375
<group name="ids_section">
376376
<field
377377
name="reg_ids"
378-
readonly="1"
378+
readonly="disabled"
379379
nolabel="1"
380380
colspan="2"
381381
>
382-
<list>
382+
<list editable="bottom">
383383
<field
384384
name="available_id_type_ids"
385385
column_invisible="1"
@@ -415,11 +415,14 @@
415415
/>
416416
<field
417417
name="related_1_ids"
418-
readonly="1"
418+
readonly="disabled"
419419
nolabel="1"
420420
colspan="2"
421421
>
422-
<list decoration-danger="disabled">
422+
<list
423+
editable="bottom"
424+
decoration-danger="disabled"
425+
>
423426
<field
424427
name="available_relation_ids"
425428
column_invisible="1"
@@ -458,11 +461,14 @@
458461
/>
459462
<field
460463
name="related_2_ids"
461-
readonly="1"
464+
readonly="disabled"
462465
nolabel="1"
463466
colspan="2"
464467
>
465-
<list decoration-danger="disabled">
468+
<list
469+
editable="bottom"
470+
decoration-danger="disabled"
471+
>
466472
<field
467473
name="available_relation_ids"
468474
column_invisible="1"
@@ -680,11 +686,11 @@
680686
<group name="group_ids_section">
681687
<field
682688
name="reg_ids"
683-
readonly="1"
689+
readonly="disabled"
684690
nolabel="1"
685691
colspan="2"
686692
>
687-
<list>
693+
<list editable="bottom">
688694
<field
689695
name="available_id_type_ids"
690696
column_invisible="1"
@@ -713,11 +719,14 @@
713719
/>
714720
<field
715721
name="related_1_ids"
716-
readonly="1"
722+
readonly="disabled"
717723
nolabel="1"
718724
colspan="2"
719725
>
720-
<list decoration-danger="disabled">
726+
<list
727+
editable="bottom"
728+
decoration-danger="disabled"
729+
>
721730
<field
722731
name="available_relation_ids"
723732
column_invisible="1"
@@ -755,11 +764,14 @@
755764
/>
756765
<field
757766
name="related_2_ids"
758-
readonly="1"
767+
readonly="disabled"
759768
nolabel="1"
760769
colspan="2"
761770
>
762-
<list decoration-danger="disabled">
771+
<list
772+
editable="bottom"
773+
decoration-danger="disabled"
774+
>
763775
<field
764776
name="available_relation_ids"
765777
column_invisible="1"

0 commit comments

Comments
 (0)