Skip to content

S
slapos.core
Commit f789bcbf authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Changes to be applied after the rebase. 

See merge request !387
parents 62e85a43 0d062341
Pipeline #21763 failed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 18716 additions and 17902 deletions
    master/bt5/slapos_accounting/bt/template_action_path_list
    View file @ f789bcbf
    Cloud Contract Line | view
    Cloud Contract Module | view
    Cloud Contract | view
    Compute Node | jump_to_consumption_report_view
    Computer Consumption TioXML File | download
    Computer Consumption TioXML File | view
    Compute Node | jump_to_consumption_report_view
    Consumption Document Module | view
    Instance Tree | jump_to_related_open_order_line
    Instance Tree | periodicity
    ......
    master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSComputeNodeMixin.xml
    View file @ f789bcbf
    ......@@ -113,14 +113,6 @@
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    ......@@ -132,36 +124,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="Message" module="Products.ERP5Type.Message"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string>Class ${reference} must be defined</string> </value>
    </item>
    <item>
    <key> <string>domain</string> </key>
    <value> <string>erp5_ui</string> </value>
    </item>
    <item>
    <key> <string>mapping</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>reference</string> </key>
    <value> <string>SlapOSComputeNodeCacheMixin</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>message</string> </key>
    <value> <string>Class ${reference} must be defined</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAllocationAlarm.xml
    View file @ f789bcbf
    ......@@ -100,24 +100,28 @@
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudConstraint.xml
    View file @ f789bcbf
    ......@@ -100,24 +100,28 @@
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudNetworkSlapInterfaceWorkflow.xml
    View file @ f789bcbf
    ......@@ -119,14 +119,6 @@
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    ......@@ -138,36 +130,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="Message" module="Products.ERP5Type.Message"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string>ID is invalid, should be \'${id_prefix}.VERSION.REFERENCE\'</string> </value>
    </item>
    <item>
    <key> <string>domain</string> </key>
    <value> <string>erp5_ui</string> </value>
    </item>
    <item>
    <key> <string>mapping</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>id_prefix</string> </key>
    <value> <string>test</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>message</string> </key>
    <value> <string>ID is invalid, should be \'${id_prefix}.VERSION.REFERENCE\'</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudShadow.xml
    View file @ f789bcbf
    ......@@ -100,25 +100,28 @@
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_crm/ModuleTemplateItem/regularisation_request_module.xml
    View file @ f789bcbf
    <module>
    <category_list>
    <category>business_application/crm</category>
    </category_list>
    <id>regularisation_request_module</id>
    <permission_list>
    <permission type='tuple'>
    ......
    master/bt5/slapos_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml
    View file @ f789bcbf
    ......@@ -32,12 +32,6 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>ticket_workflow</string> </value>
    ......
    master/bt5/slapos_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variable_error_message.xml 0 → 100644
    View file @ f789bcbf
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Workflow Variable" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>automatic_update</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>for_catalog</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>variable_error_message</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Workflow Variable</string> </value>
    </item>
    <item>
    <key> <string>status_included</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Slave%20Instance.xml
    View file @ f789bcbf
    ......@@ -40,4 +40,4 @@
    <property id='base_category_script'>SlaveInstance_getSecurityCategoryFromSoftwareInstance</property>
    <multi_property id='base_category'>aggregate</multi_property>
    </role>
    </type_roles>
    </type_roles>
    \ No newline at end of file
    master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Instance.xml
    View file @ f789bcbf
    ......@@ -35,4 +35,4 @@
    <multi_property id='categories'>local_role_group/project</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
    </role>
    </type_roles>
    </type_roles>
    \ No newline at end of file
    master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSCodingStyle.py
    View file @ f789bcbf
    ......@@ -42,6 +42,19 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
    'InstanceTree_viewConsumptionReport',
    'Person_viewResourceConsumptionReport'})
    CodingStyleTestCase.rebuild_business_template_ignored_path += """
    # Those preferences are changed after the installation, so we skip
    # to check re-export.
    slapos_cloud/PreferenceTemplateItem/portal_preferences/slapos_default_system_preference.xml
    slapos_cloud/PreferenceTemplateItem/portal_preferences/slapos_default_site_preference.xml
    # WebSite is updated after the installation to re-generate the translation data.
    # This list should be reconsider later so we can keep information accurated.
    slapos_jio/PathTemplateItem/web_site_module/hostingjs.xml
    slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_translation_data_js.js
    slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_translation_data_js.xml
    """
    SlapOSTestCaseMixin.afterSetUp(self)
    def getBusinessTemplateList(self):
    ......
    master/bt5/slapos_jio/PathTemplateItem/web_site_module/hostingjs.xml
    View file @ f789bcbf
    ......@@ -701,7 +701,7 @@
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>985.8936.26794.59579</string> </value>
    <value> <string>999.2068.62564.17</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    ......@@ -719,7 +719,7 @@
    </tuple>
    <state>
    <tuple>
    <float>1597354424.8</float>
    <float>1652448693.65</float>
    <string>UTC</string>
    </tuple>
    </state>
    ......
    master/bt5/slapos_pdm/ModuleTemplateItem/upgrade_decision_module.xml
    View file @ f789bcbf
    <module>
    <category_list>
    <category>business_application/crm</category>
    </category_list>
    <id>upgrade_decision_module</id>
    <permission_list>
    <permission type='tuple'>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7