Merge branch 'master' into rename_instance

master/bt5/vifib_erp5/TestTemplateItem/testVifibModuleSecurity.py

@@ -34,7 +34,38 @@ class TestVifibModuleSecurity(testVifibMixin):
   """
  
   used_module_id_list = [
+    'accounting_module',
+    'account_module',
+    'campaign_module',
+    'component_module',
+    'currency_module',
+    'document_ingestion_module',
+    'document_module',
+    'event_module',
+    'image_module',
+    'internal_packing_list_module',
+    'inventory_module',
     'knowledge_pad_module',
+    'meeting_module',
+    'notification_message_module',
+    'open_sale_order_module',
+    'organisation_module',
+    'person_module',
+    'product_module',
+    'purchase_order_module',
+    'purchase_packing_list_module',
+    'purchase_trade_condition_module',
+    'query_module',
+    'sale_opportunity_module',
+    'sale_order_module',
+    'sale_packing_list_module',
+    'sale_trade_condition_module',
+    'service_module',
+    'software_product_module',
+    'software_release_module',
+    'support_request_module',
+    'transformation_module',
+    'web_page_module',
     'web_site_module',
   ]
  

master/bt5/vifib_erp5/bt/revision

-301
+302
\ No newline at end of file

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_editWebMode.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>request = context.REQUEST\n
+if \'field_my_text_content\' in request:\n
+  context.edit(text_content=request[\'field_my_text_content\'])\n
+return context.Base_redirect(\'view\', keep_items={\'portal_status_message\':context.Base_translateString(\'Data updated.\')})\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>*args, **kwargs</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>SoftwareInstance_editWebMode</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/my_update_button.xml

@@ -92,7 +92,7 @@
                 </item>
                 <item>
                     <key> <string>name</string> </key>
-                    <value> <string>Base_edit:method</string> </value>
+                    <value> <string>SoftwareInstance_editWebMode:method</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>

master/bt5/vifib_web/bt/revision

-315
+316
\ No newline at end of file

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -145,7 +145,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -154,15 +153,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -174,7 +170,6 @@ erp5_web_widget_library
 erp5_xhtml_jquery_style
 erp5_xhtml_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -239,7 +234,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -248,15 +242,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -268,7 +259,6 @@ erp5_web_widget_library
 erp5_xhtml_jquery_style
 erp5_xhtml_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -333,7 +323,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -342,15 +331,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -362,7 +348,6 @@ erp5_web_widget_library
 erp5_xhtml_jquery_style
 erp5_xhtml_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -422,7 +407,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -430,15 +414,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -449,7 +430,6 @@ erp5_web_minimal_theme
 erp5_web_widget_library
 erp5_xhtml_jquery_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -509,7 +489,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -517,15 +496,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -536,7 +512,6 @@ erp5_web_minimal_theme
 erp5_web_widget_library
 erp5_xhtml_jquery_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -598,7 +573,6 @@ erp5_glossary
 erp5_html_compatibility
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -607,15 +581,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -627,7 +598,6 @@ erp5_web_widget_library
 erp5_xhtml_jquery_style
 erp5_xhtml_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -688,7 +658,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -698,15 +667,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -718,7 +684,6 @@ erp5_web_widget_library
 erp5_xhtml_jquery_style
 erp5_xhtml_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -778,7 +743,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -786,15 +750,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -805,7 +766,6 @@ erp5_web_minimal_theme
 erp5_web_widget_library
 erp5_xhtml_jquery_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content
@@ -865,7 +825,6 @@ erp5_gadget
 erp5_glossary
 erp5_ingestion
 erp5_ingestion_test
-erp5_integration
 erp5_invoicing
 erp5_item
 erp5_item_trade
@@ -873,15 +832,12 @@ erp5_ods_core
 erp5_odt_core
 erp5_ooo_import
 erp5_open_trade
-erp5_payzen_secure_payment
 erp5_pdm
 erp5_project
 erp5_project_trade
-erp5_secure_payment
 erp5_simplified_invoicing
 erp5_simulation_test
 erp5_software_pdm
-erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
@@ -893,7 +849,6 @@ erp5_web_widget_library
 erp5_xhtml_jquery_style
 erp5_xhtml_style
 external_method
-vifib_payzen
 Images
 activity
 zpt_content

slapos/grid/slapgrid.py

@@ -667,7 +667,8 @@ class Slapgrid(object):
 
     clean_run = True
     #We loop on the different computer partitions
-    for computer_partition in slap_computer_usage.getComputerPartitionList():
+    computer_partition_list = slap_computer_usage.getComputerPartitionList()
+    for computer_partition in computer_partition_list:
       computer_partition_id = computer_partition.getId()
 
       #We want execute all the script in the report folder
@@ -726,7 +727,7 @@ class Slapgrid(object):
 
     #Now we loop through the different computer partitions to ggetId()et reports
     report_usage_issue_cp_list = []
-    for computer_partition in slap_computer_usage.getComputerPartitionList():
+    for computer_partition in computer_partition_list:
       filename_delete_list = []
       computer_partition_id = computer_partition.getId()
       instance_path = os.path.join(self.instance_root, computer_partition_id)
@@ -800,7 +801,7 @@ class Slapgrid(object):
         computer_partition.error(issue)
         report_usage_issue_cp_list.append(computer_partition_id)
 
-    for computer_partition in slap_computer_usage.getComputerPartitionList():
+    for computer_partition in computer_partition_list:
       computer_partition_id = computer_partition.getId()
       try:
         software_url = computer_partition.getSoftwareRelease().getURI()