Skip to content

Commit 113a3b3

Browse files
Merge pull request #482 from OpenSPP/fix-indicator-duplicate
Fixed duplicate checkbox in the additional details; added test case
2 parents 88bc3a0 + 6e13272 commit 113a3b3

File tree

3 files changed

+35
-8
lines changed

3 files changed

+35
-8
lines changed

spp_custom_field/models/cus_partner.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ def create_field_element(self, div_element, model_field_id, is_ind=False):
2828
sub_element_params = {
2929
"name": model_field_id.name,
3030
}
31-
if is_ind:
32-
sub_element_params["readonly"] = "1"
33-
sub_element_params["class"] = "oe_read_only"
3431
new_field = etree.SubElement(
3532
div_element_left,
3633
"field",
@@ -42,9 +39,6 @@ def create_field_element(self, div_element, model_field_id, is_ind=False):
4239
span = etree.SubElement(div_element_right_help, "span")
4340
span.text = model_field_id.help
4441

45-
div_element_right_inner_div = etree.SubElement(div_element_right, "div", {"class": "text-muted"})
46-
new_field = etree.SubElement(div_element_right_inner_div, "field", {"name": model_field_id.name})
47-
4842
else:
4943
etree.SubElement(div_element_right, "label", {"for": model_field_id.name})
5044

@@ -82,8 +76,8 @@ def _get_view(self, view_id=None, view_type="form", **options):
8276
action_id = action_id.context.replace("'", '"')
8377
is_group = ast.literal_eval(action_id).get("default_is_group")
8478

85-
custom_page = etree.Element("page", {"string": "Additional Details"})
86-
indicators_page = etree.Element("page", {"string": "Indicators"})
79+
custom_page = etree.Element("page", {"string": "Additional Details", "name": "additional_details"})
80+
indicators_page = etree.Element("page", {"string": "Indicators", "name": "indicators"})
8781

8882
custom_div = etree.SubElement(custom_page, "div", {"class": "row mt16 o_settings_container"})
8983
indicators_div = etree.SubElement(indicators_page, "div", {"class": "row mt16 o_settings_container"})

spp_demo/tests/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import test_cus_partner

spp_demo/tests/test_cus_partner.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
from odoo.tests.common import TransactionCase
2+
3+
4+
class TestOpenSPPResPartnerCustom(TransactionCase):
5+
@classmethod
6+
def setUpClass(cls):
7+
super().setUpClass()
8+
cls.view_group_id = cls.env.ref("g2p_registry_group.view_groups_form").id
9+
cls.view_group_action_id = cls.env.ref("g2p_registry_group.action_groups_list").id
10+
11+
cls.view_individual_id = cls.env.ref("g2p_registry_individual.view_individuals_form").id
12+
cls.view_individual_action_id = cls.env.ref("g2p_registry_individual.action_individuals_list").id
13+
14+
def test_get_view_group(self):
15+
options = {"action_id": self.view_group_action_id, "load_filters": True, "toolbar": True}
16+
arch, view = self.env["res.partner"]._get_view(self.view_group_id, "form", **options)
17+
18+
self.assertEqual(len(arch.xpath("//page[@name='indicators']")), 1)
19+
self.assertEqual(len(arch.xpath("//page[@name='additional_details']")), 0)
20+
21+
def test_get_view_individual(self):
22+
options = {"action_id": self.view_individual_action_id, "load_filters": True, "toolbar": True}
23+
arch, view = self.env["res.partner"]._get_view(self.view_individual_id, "form", **options)
24+
25+
self.assertEqual(len(arch.xpath("//page[@name='indicators']")), 0)
26+
self.assertEqual(len(arch.xpath("//page[@name='additional_details']")), 1)
27+
28+
def test_get_view_no_options(self):
29+
arch, view = self.env["res.partner"]._get_view(self.view_individual_id, "form")
30+
31+
self.assertEqual(len(arch.xpath("//page[@name='indicators']")), 0)
32+
self.assertEqual(len(arch.xpath("//page[@name='additional_details']")), 1)

0 commit comments

Comments
 (0)