From 6a22a89193a96e060082802703dca77b8d73508f Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Thu, 10 Mar 2011 14:56:59 +0000 Subject: [PATCH] - add new test and refactor the script to change state of object when it is invisible git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44138 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_web_ung_theme/WebSection_addGadget.xml | 7 +++++-- bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py | 13 +++++++++++++ bt5/erp5_web_ung_theme/bt/revision | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_addGadget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_addGadget.xml index 7d277e6852..1ce5cd03d3 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_addGadget.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_addGadget.xml @@ -57,8 +57,11 @@ knowledge_pad = portal_catalog.getResultValue(portal_type="Knowledge Pad",\n validation_state=["visible", "public"])\n \n knowledge_box = knowledge_pad.newContent(portal_type="Knowledge Box")\n -\n -knowledge_box.setSpecialise("portal_gadgets/%s" % gadget_id)\n +gadget_relative_url = "portal_gadgets/%s" % gadget_id\n +gadget = portal_catalog.getResultValue(portal_type="Gadget", id=gadget_id)\n +if gadget.getValidationState() == "invisible":\n + gadget.visible()\n +knowledge_box.setSpecialise(gadget_relative_url)\n knowledge_box.visible()\n </string> </value> </item> diff --git a/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py b/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py index d34b2340ad..64c7c846a7 100644 --- a/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py +++ b/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py @@ -324,3 +324,16 @@ class TestUNG(ERP5TypeTestCase): self.login("ung_reference") user = portal.ERP5Site_getAuthenticatedMemberPersonValue() self.assertEquals(user.getFirstName(), "UNG") + + def testWebSection_addGadget(self): + """Test if gadgets are added correctly""" + obj = self.portal.knowledge_pad_module.newContent(portal_type="Knowledge Pad") + obj.visible() + self.stepTic() + gadget = self.portal.portal_gadgets.searchFolder()[0] + gadget_id = gadget.getId() + self.portal.web_site_module.ung.WebSection_addGadget(gadget_id) + self.stepTic() + gadget = self.portal.portal_catalog.getResultValue(portal_type="Gadget", + validation_state="visible") + self.assertEquals(gadget_id, gadget.getId()) \ No newline at end of file diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index ac7cd1ac70..c2567dc4fb 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -279 \ No newline at end of file +280 \ No newline at end of file -- 2.30.9