From 88df600e6ff966c101140491cdeab83b8476fa9b Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Fri, 25 Jan 2019 19:35:56 +0000 Subject: [PATCH] slapos_subscription_request: Add property sheet for include getStartDate in Subscription Request --- .../property_sheet_list.xml | 1 + .../test.erp5.testSlapOSSubscriptionSkins.py | 3 +-- .../test.erp5.testSlapOSSubscriptionSkins.xml | 8 ++++---- .../bt/template_portal_type_property_sheet_list | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/master/bt5/slapos_subscription_request/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/master/bt5/slapos_subscription_request/PortalTypePropertySheetTemplateItem/property_sheet_list.xml index 514fce2aa..f9ded22ef 100644 --- a/master/bt5/slapos_subscription_request/PortalTypePropertySheetTemplateItem/property_sheet_list.xml +++ b/master/bt5/slapos_subscription_request/PortalTypePropertySheetTemplateItem/property_sheet_list.xml @@ -17,6 +17,7 @@ <item>SlapOSAccountingHostingSubscriptionConstraint</item> <item>SlaposHostingSubscriptionConstraint</item> <item>SoftwareInstance</item> + <item>Task</item> <item>TextDocument</item> <item>Url</item> <item>VariationRange</item> diff --git a/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py b/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py index 1bd627681..e0308e5ef 100644 --- a/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py +++ b/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py @@ -25,7 +25,6 @@ class TestSubscriptionSkinsMixin(SlapOSTestCaseMixinWithAbort): ) self.tic() return subscription_request - class TestBase_instanceXmlToDict(TestSubscriptionSkinsMixin): @@ -296,7 +295,7 @@ class TestSubscriptionRequest_createUser(TestSubscriptionSkinsMixin): self.assertEqual(person.getFirstName(), name) erp5_login = [i for i in person.searchFolder(portal_type="ERP5 Login")][0] - self.assertEqual(person.getValidationState(), "validated") + self.assertEqual(person.getValidationState(), "draft") self.assertEqual(erp5_login.getValidationState(), "validated") self.assertEqual(erp5_login.getReference(), person.getUserId()) diff --git a/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.xml b/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.xml index 373f3367b..57877bea5 100644 --- a/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.xml +++ b/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.xml @@ -46,10 +46,10 @@ <key> <string>text_content_warning_message</string> </key> <value> <tuple> - <string>W:255, 4: Unused variable \'email\' (unused-variable)</string> - <string>W:256, 4: Unused variable \'name\' (unused-variable)</string> - <string>W:267, 4: Unused variable \'name\' (unused-variable)</string> - <string>W:276, 4: Unused variable \'name\' (unused-variable)</string> + <string>W:254, 4: Unused variable \'email\' (unused-variable)</string> + <string>W:255, 4: Unused variable \'name\' (unused-variable)</string> + <string>W:266, 4: Unused variable \'name\' (unused-variable)</string> + <string>W:275, 4: Unused variable \'name\' (unused-variable)</string> </tuple> </value> </item> diff --git a/master/bt5/slapos_subscription_request/bt/template_portal_type_property_sheet_list b/master/bt5/slapos_subscription_request/bt/template_portal_type_property_sheet_list index c6eb9829a..65cee3adf 100644 --- a/master/bt5/slapos_subscription_request/bt/template_portal_type_property_sheet_list +++ b/master/bt5/slapos_subscription_request/bt/template_portal_type_property_sheet_list @@ -13,6 +13,7 @@ Subscription Request | Reference Subscription Request | SlapOSAccountingHostingSubscriptionConstraint Subscription Request | SlaposHostingSubscriptionConstraint Subscription Request | SoftwareInstance +Subscription Request | Task Subscription Request | TextDocument Subscription Request | Url Subscription Request | VariationRange -- 2.30.9