Commit 36d19481 authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into master-dev

parents 4819937b 6ff45304
Changes Changes
======= =======
1.3.18 (2016-11-03)
-------------------
* update default web url of master to slapos.vifib.com
1.3.17 (2016-10-25)
-------------------
* slapos.grid: Always remove .timestamp and .slapgrid if partition is destroyed.
* slapos.proxy: Propagate parent partition state to children
* slapos.grid: Increase min space (1G)
* slapos.grid: Save slapgrid state into the partition
* slapos.format: Remove passwd call while format.
* svcbackend: explicitely call the executable instead of using Popen 'executable' keyword.
* slapos.grid: Introduce new garbage collector for instances ignored by buildout
1.3.16 (2016-09-29) 1.3.16 (2016-09-29)
------------------- -------------------
* slapos.format: Include disk usage report. Do not divide cpu_load by number of cpu cores. * slapos.format: Include disk usage report. Do not divide cpu_load by number of cpu cores.
......
...@@ -13,8 +13,8 @@ class TestSlapOSPersonDocument(testSlapOSMixin): ...@@ -13,8 +13,8 @@ class TestSlapOSPersonDocument(testSlapOSMixin):
person = self.portal.person_module.newContent( person = self.portal.person_module.newContent(
portal_type="Person") portal_type="Person")
# Default title is empty # Default title person is the object id.
self.assertEquals(person.getTitle(), "") self.assertEquals(person.getTitle(), person.getId())
# If not title, the email is used # If not title, the email is used
person.edit(default_email_coordinate_text="foo@example.org") person.edit(default_email_coordinate_text="foo@example.org")
......
...@@ -6,10 +6,22 @@ ...@@ -6,10 +6,22 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>testSlapOSCloudDocument</string> </value> <value> <string>testSlapOSCloudDocument</string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>test.erp5.testSlapOSCloudDocument</string> </value> <value> <string>test.erp5.testSlapOSCloudDocument</string> </value>
...@@ -43,13 +55,28 @@ ...@@ -43,13 +55,28 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -62,7 +89,7 @@ ...@@ -62,7 +89,7 @@
<item> <item>
<key> <string>component_validation_workflow</string> </key> <key> <string>component_validation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -71,7 +98,7 @@ ...@@ -71,7 +98,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_view</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>view_ticket</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Ticket</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/HostingSubscription_viewTicket</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</item> </item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string></string> </value> <value> <string>Base_edit</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -59,8 +59,11 @@ ...@@ -59,8 +59,11 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>top</string> <string>left</string>
<string>breadcrumb</string> <string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -69,27 +72,46 @@ ...@@ -69,27 +72,46 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>breadcrumb</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>breadcrumb _box</string> <string>listbox</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>top</string> </key> <key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>top_box</string> <string>my_title</string>
<string>my_reference</string>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>vifib_hosting_order_layout</string> </value> <value> <string>HostingSubscription_viewTicket</string> </value>
</item> </item>
<item> <item>
<key> <string>method</string> </key> <key> <string>method</string> </key>
...@@ -97,11 +119,11 @@ ...@@ -97,11 +119,11 @@
</item> </item>
<item> <item>
<key> <string>name</string> </key> <key> <string>name</string> </key>
<value> <string>vifib_hosting_order_layout</string> </value> <value> <string>HostingSubscription_view</string> </value>
</item> </item>
<item> <item>
<key> <string>pt</string> </key> <key> <string>pt</string> </key>
<value> <string>template_vifib_jauks</string> </value> <value> <string>form_view</string> </value>
</item> </item>
<item> <item>
<key> <string>row_length</string> </key> <key> <string>row_length</string> </key>
...@@ -113,7 +135,7 @@ ...@@ -113,7 +135,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Vifib Default Layout</string> </value> <value> <string>Hosting Subscription</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode_mode</string> </key> <key> <string>unicode_mode</string> </key>
......
...@@ -10,17 +10,20 @@ ...@@ -10,17 +10,20 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>css_class</string> <string>columns</string>
<string>default</string> <string>count_method</string>
<string>description</string> <string>editable_columns</string>
<string>editable</string> <string>hide_rows_on_no_search_criterion</string>
<string>list_method</string>
<string>search_columns</string>
<string>selection_name</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_error_message</string> </value> <value> <string>listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -57,17 +60,11 @@ ...@@ -57,17 +60,11 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>editable_columns</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -78,6 +75,24 @@ ...@@ -78,6 +75,24 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -94,28 +109,74 @@ ...@@ -94,28 +109,74 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>columns</string> </key>
<value> <string>nolabel description</string> </value> <value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>count_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>editable_columns</string> </key>
<value> <string>Sorry, we encoured an error</string> </value> <value>
<list/>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewWebFieldLibrary</string> </value>
</item>
<item>
<key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>list_method</string> </key>
<value> <string>my_editor_field</string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>search_columns</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value> <value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>software_instance_selection</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
...@@ -123,7 +184,7 @@ ...@@ -123,7 +184,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Description</string> </value> <value> <string>Tickets</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -139,11 +200,20 @@ ...@@ -139,11 +200,20 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>python: \'hosting_subscription_%s_winstance_list\' % here.getUid()</string> </value>
</item>
python: \'<p class="error">%s</p>\' % (context.Base_translateString(field.get_value(\'description\'))) </dictionary>
</pickle>
]]></string> </value> </record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_getOpenRelatedTicketList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
Computer | view_related_support_request Computer | view_related_support_request
Hosting Subscription | view_ticket
Regularisation Request Module | rss_view Regularisation Request Module | rss_view
Regularisation Request Module | view Regularisation Request Module | view
Regularisation Request | clone_ticket_and_event_list Regularisation Request | clone_ticket_and_event_list
......
...@@ -113,6 +113,7 @@ class TestSlaposSkinSelection(testSlapOSMixin): ...@@ -113,6 +113,7 @@ class TestSlaposSkinSelection(testSlapOSMixin):
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -196,7 +197,6 @@ erp5_rss_core ...@@ -196,7 +197,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -213,9 +213,6 @@ erp5_xhtml_style ...@@ -213,9 +213,6 @@ erp5_xhtml_style
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -229,6 +226,7 @@ zpt_generic ...@@ -229,6 +226,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -307,7 +305,6 @@ erp5_rss_core ...@@ -307,7 +305,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -324,9 +321,6 @@ erp5_xhtml_style ...@@ -324,9 +321,6 @@ erp5_xhtml_style
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -340,6 +334,7 @@ zpt_generic ...@@ -340,6 +334,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -419,7 +414,6 @@ erp5_rss_core ...@@ -419,7 +414,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -436,9 +430,6 @@ erp5_xhtml_style ...@@ -436,9 +430,6 @@ erp5_xhtml_style
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -452,6 +443,7 @@ zpt_generic ...@@ -452,6 +443,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -529,7 +521,6 @@ erp5_rss_core ...@@ -529,7 +521,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -545,9 +536,6 @@ erp5_workflow ...@@ -545,9 +536,6 @@ erp5_workflow
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -561,6 +549,7 @@ zpt_generic ...@@ -561,6 +549,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -638,7 +627,6 @@ erp5_rss_core ...@@ -638,7 +627,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -655,9 +643,6 @@ erp5_xhtml_style ...@@ -655,9 +643,6 @@ erp5_xhtml_style
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -671,6 +656,7 @@ zpt_generic ...@@ -671,6 +656,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -748,7 +734,6 @@ erp5_rss_core ...@@ -748,7 +734,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -764,9 +749,6 @@ erp5_workflow ...@@ -764,9 +749,6 @@ erp5_workflow
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -780,6 +762,7 @@ zpt_generic ...@@ -780,6 +762,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -857,7 +840,6 @@ erp5_rss_core ...@@ -857,7 +840,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -873,9 +855,6 @@ erp5_workflow ...@@ -873,9 +855,6 @@ erp5_workflow
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -889,12 +868,12 @@ zpt_generic ...@@ -889,12 +868,12 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
slapos_upgrader slapos_upgrader
slapos_rss slapos_rss
vifib_hosting
slapos_contract slapos_contract
slapos_crm_monitoring slapos_crm_monitoring
slapos_accounting slapos_accounting
...@@ -968,7 +947,6 @@ erp5_rss_core ...@@ -968,7 +947,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -984,9 +962,6 @@ erp5_workflow ...@@ -984,9 +962,6 @@ erp5_workflow
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -1000,6 +975,7 @@ zpt_generic ...@@ -1000,6 +975,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -1078,7 +1054,6 @@ erp5_rss_core ...@@ -1078,7 +1054,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -1095,9 +1070,6 @@ erp5_xhtml_style ...@@ -1095,9 +1070,6 @@ erp5_xhtml_style
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -1111,6 +1083,7 @@ zpt_generic ...@@ -1111,6 +1083,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
slapos_ecoallocation slapos_ecoallocation
slapos_erp5 slapos_erp5
...@@ -1189,7 +1162,6 @@ erp5_rss_core ...@@ -1189,7 +1162,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -1206,9 +1178,6 @@ erp5_xhtml_style ...@@ -1206,9 +1178,6 @@ erp5_xhtml_style
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
...@@ -1222,6 +1191,7 @@ zpt_generic ...@@ -1222,6 +1191,7 @@ zpt_generic
selection_string_list = \ selection_string_list = \
""" """
custom custom
erp5_font
erp5_web_hal_json erp5_web_hal_json
erp5_web_renderjs_ui erp5_web_renderjs_ui
slapos_ecoallocation slapos_ecoallocation
...@@ -1299,7 +1269,6 @@ erp5_rss_core ...@@ -1299,7 +1269,6 @@ erp5_rss_core
erp5_secure_payment erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_software_pdm erp5_software_pdm
erp5_stock_cache
erp5_system_event erp5_system_event
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -1315,9 +1284,6 @@ erp5_workflow ...@@ -1315,9 +1284,6 @@ erp5_workflow
external_method external_method
Images Images
activity activity
zpt_content
zpt_control
zpt_generic
""" """
self.assertSameSkinSelection(skin_name, selection_string_list) self.assertSameSkinSelection(skin_name, selection_string_list)
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</item> </item>
<item> <item>
<key> <string>container_layout</string> </key> <key> <string>container_layout</string> </key>
<value> <string>vifib_hosting_order_layout</string> </value> <value> <string>vifib_jauks_layout</string> </value>
</item> </item>
<item> <item>
<key> <string>custom_render_method_id</string> </key> <key> <string>custom_render_method_id</string> </key>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</item> </item>
<item> <item>
<key> <string>container_layout</string> </key> <key> <string>container_layout</string> </key>
<value> <string>vifib_hosting_order_layout</string> </value> <value> <string>vifib_jauks_layout</string> </value>
</item> </item>
<item> <item>
<key> <string>custom_render_method_id</string> </key> <key> <string>custom_render_method_id</string> </key>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</item> </item>
<item> <item>
<key> <string>container_layout</string> </key> <key> <string>container_layout</string> </key>
<value> <string>vifib_hosting_order_layout</string> </value> <value> <string>vifib_jauks_layout</string> </value>
</item> </item>
<item> <item>
<key> <string>custom_render_method_id</string> </key> <key> <string>custom_render_method_id</string> </key>
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
</item> </item>
<item> <item>
<key> <string>container_layout</string> </key> <key> <string>container_layout</string> </key>
<value> <string>vifib_hosting_order_layout</string> </value> <value> <string>vifib_jauks_layout</string> </value>
</item> </item>
<item> <item>
<key> <string>content_layout</string> </key> <key> <string>content_layout</string> </key>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</skin_folder_selection> </skin_folder_selection>
<skin_folder_selection> <skin_folder_selection>
<skin_folder>vifib_hosting</skin_folder> <skin_folder>vifib_hosting</skin_folder>
<skin_selection>Hosting,RSS</skin_selection> <skin_selection>Hosting</skin_selection>
</skin_folder_selection> </skin_folder_selection>
<skin_folder_selection> <skin_folder_selection>
<skin_folder>vifib_hosting_theme</skin_folder> <skin_folder>vifib_hosting_theme</skin_folder>
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</item> </item>
<item> <item>
<key> <string>selection_name</string> </key> <key> <string>selection_name</string> </key>
<value> <string>vifib_software_release_selection</string> </value> <value> <string>software_product_software_release_order_selection</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
......
"""Add selected product to the cart and continue"""
portal = context.getPortalObject()
if len(uids) != 1:
return context.Base_redirect(dialog_id,
keep_items={'portal_status_message':context.Base_translateString("Please select one service.")})
session = context.WebSection_getVifibSession()
params = portal.portal_selections.getSelectionParamsFor('vifib_session_id')
params["instance_software_product_uid"] = uids[0]
portal.portal_selections.setSelectionParamsFor('vifib_session_id', params)
if kw.has_key('came_from'):
#we override the context to redirect the user to the next web section
context = portal.restrictedTraverse(kw['came_from'])
context.WebSection_viewNextStep()
<?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>_params</string> </key>
<value> <string>dialog_id, uids=[], quantity=1, reset_shopping_cart=True, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebSection_addSelectedSoftwareProductToShoppingCart</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
"""Add selected release to the cart and continue"""
portal = context.getPortalObject()
if len(uids) != 1:
return context.Base_redirect(dialog_id,
keep_items={'portal_status_message':context.Base_translateString("Please select one software release.")})
else:
session = context.WebSection_getVifibSession()
params = portal.portal_selections.getSelectionParamsFor('vifib_session_id')
params["instance_software_release_uid"] = uids[0]
portal.portal_selections.setSelectionParamsFor('vifib_session_id', params)
if kw.has_key('came_from'):
#we override the context to redirect the user to the next web section
context = portal.restrictedTraverse(kw['came_from'])
software_release = portal.portal_catalog.getResultValue(uid=uids[0])
return software_release.Base_redirect('SoftwareRelease_viewRequestDialog')
# context.WebSection_viewNextStep()
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</item> </item>
<item> <item>
<key> <string>selection_name</string> </key> <key> <string>selection_name</string> </key>
<value> <string>vifib_product_selection</string> </value> <value> <string>vifib_product_service_choice_dialog_selection</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>enabled</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>breadcrumb _box</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewWebFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Navigation</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>context/SaleOrder_viewBreadcrumbWidget</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>default</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>top_box</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewWebFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Navigation</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>context/WebSite_viewTopBarWidget</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
# This script returns an iterable of the paths to standard CSS objects.
return ('km_css/km_listbox.css',
'vifib_style/listbox.css',
'vifib_style/vifib.css',
'vifib_style/zocial.css')
# This script returns an iterable of the paths to standard JavaScript objects.
return ('jquery/core/jquery.js', )
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<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_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ListBox_asUnorderedListHTML</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<tal:block
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
tal:define="field_id here/getId;
form_id python: here.getForm().id;
portal_url_string request/current_web_site_url;
real_context here/getContext;
context_url real_context/absolute_url;
line_list here/query;"
i18n:domain="ui">
<tal:comment replace="nothing">
Docstring: Display listbox as ul with RSS link
Interest: create box to display last element with rss feature
</tal:comment>
<tal:block tal:define="max_lines python: int(here.getMaxLineNumber());
total_line python: int(here.total_size);
label_list here/getLabelValueList ;">
<tal:comment replace="nothing">
Info : for list in label_list
sql python: list[0];
title python: list[1];
sort_order python: list[2]">
</tal:comment>
<a tal:attributes="href python: 'WebSite_redirectToPermanentRss?object_url=%s/%s/%s' % (context_url, form_id, field_id)">
<img src="./vifib_image/rss.png" tal:attributes="src python: '%s/vifib_image/rss.png' % portal_url_string"/>
</a>
<div tal:condition="python: total_line == 0" id="result" class="warning clear" i18n:translate="">No results.</div>
<ul tal:condition="line_list" class="clear">
<li tal:repeat="line line_list">
<tal:block tal:repeat="value line/render">
<div tal:define="html python: value[0];
original_value python: value[1];
empty python: original_value in ('', None) and not request.get('editable_mode')"
tal:attributes="class python: repeat['value'].index==0 and 'main' or not repeat['value'].index==0 and 'second'">
<span tal:condition="not: empty" class='title' i18n:translate="" tal:content="python: label_list[repeat['value'].index][1]" />
<span tal:condition="not: empty" tal:replace="structure html">value</span>
</div>
</tal:block>
</li>
</ul>
</tal:block>
<!-- ListBox ends here -->
</tal:block>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<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_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SaleOrder_viewBreadcrumbWidget</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<tal:comment replace="nothing">
This widget displays the breadcrumbs of the current context.
</tal:comment>
<tal:block tal:define="website here/getWebSiteValue;
portal_path website/absolute_url;
current_web_section python:request.get('current_web_section', here);
current_web_section_url current_web_section/getAbsoluteUrl;
breadcrumb_list python: context.WebSite_getMainSection().WebSection_getSiteMapTree(property_mapping=('translated_title','id',));">
<ul id="order_breadcrump" class="center"
tal:define="global time string:past">
<tal:block tal:repeat="breadcrumb breadcrumb_list">
<tal:block tal:define="is_active python: current_web_section_url == breadcrumb['url']">
<tal:if tal:condition='is_active'>
<tal:block tal:define="global time string:next"/>
</tal:if>
<li tal:attributes="class python: is_active and 'active' or time">
<img tal:define="img_name python: (is_active or time=='past') and breadcrumb['id'] + '_active' or breadcrumb['id'];"
tal:attributes="src python: '%s/vifib_hosting_image/%s.png' % (portal_path, img_name);
alt breadcrumb/id" />
<a tal:attributes="href python: (is_active or time=='past') and breadcrumb['url'] or None"
tal:content="breadcrumb/translated_title"/>
</li>
<span class="arrow" tal:condition="not:repeat/breadcrumb/end">
<img alt="arrow" tal:attributes="src python: '%s/vifib_hosting_image/arrow%s.png' % (portal_path, (time=='past' and '_active' or ''));" />
</span>
</tal:block>
</tal:block>
</ul>
</tal:block>
...@@ -94,21 +94,16 @@ ...@@ -94,21 +94,16 @@
<value> <value>
<list> <list>
<string>your_string_field</string> <string>your_string_field</string>
<string>your_email</string>
<string>my_translated_description</string> <string>my_translated_description</string>
<string>my_error_message</string>
<string>my_section_title</string> <string>my_section_title</string>
<string>my_subsection_title</string> <string>my_subsection_title</string>
<string>my_editor_field</string> <string>my_editor_field</string>
<string>your_integer_field</string>
<string>my_rss_mode_listbox</string>
<string>my_list_mode_listbox</string> <string>my_list_mode_listbox</string>
<string>my_input_button_field</string> <string>my_input_button_field</string>
<string>my_string_field</string> <string>my_string_field</string>
<string>your_text_area_field</string> <string>your_text_area_field</string>
<string>my_hyperlink</string> <string>my_hyperlink</string>
<string>my_lines_field</string> <string>my_lines_field</string>
<string>my_thumbnail</string>
<string>my_text_area_field</string> <string>my_text_area_field</string>
<string>my_default_text_content</string> <string>my_default_text_content</string>
</list> </list>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>columns</string>
<string>css_class</string>
<string>list_action</string>
<string>page_template</string>
<string>sort</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_rss_mode_listbox</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string></string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string>last_element</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>list_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string>ListBox_asUnorderedListHTML</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list>
<tuple>
<string>creation_date</string>
<string>descending</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>listbox</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_thumbnail</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_thumbnail</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>File_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Image</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_email</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_email</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_integer_field</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>display_width</string> </key>
<value> <int>25</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_integer_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>you_integer_field</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
"""Return a property layout from a website.
Useful to use notification message reference from website configuration not in website context."""
portal = context.getPortalObject()
current_web_site = portal.getWebSiteValue()
try:
website = getattr(portal.web_site_module,website)
except TypeError:
#website parameter is None
website = current_website
except AttributeError:
#website parameter is from a non existant web site
website = current_web_site
return website.getLayoutProperty(reference, defaultValue)
<?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>_params</string> </key>
<value> <string>reference, defaultValue, website=None</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebSite_getLayoutProperty</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -3,7 +3,6 @@ erp5_km_theme | Hosting ...@@ -3,7 +3,6 @@ erp5_km_theme | Hosting
erp5_xhtml_style | Hosting erp5_xhtml_style | Hosting
slapos_rss | RSS slapos_rss | RSS
vifib_hosting | Hosting vifib_hosting | Hosting
vifib_hosting | RSS
vifib_hosting_theme | Hosting vifib_hosting_theme | Hosting
vifib_jauks_theme | Hosting vifib_jauks_theme | Hosting
vifib_jauks_widget_library | Hosting vifib_jauks_widget_library | Hosting
......
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
#### Setup Ansible and load few libraries #####
PLAYBOOK_REPOSITORY_URL=https://lab.nexedi.com/nexedi/slapos.package.git
is_package_installed git || install_package git
git clone $PLAYBOOK_REPOSITORY_URL
\ No newline at end of file
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook erp5-standalone.yml -i hosts --connection=local
\ No newline at end of file
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook gnet-re6stnet.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook gnet-server.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook gnet-upgrader-install.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_unstable_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-vm-bootstrap.yml -i hosts --connection=local
#!/bin/bash
# Configure network interface
rm -rf /tmp/dropcmd
wget -O /etc/opt/netconfigure http://10.0.2.100/netconfig.sh
wget -O /tmp/dropcmd -q http://10.0.2.100/delDefaultIface
if [[ -s "/tmp/dropcmd" ]]
then
echo "nameserver 8.8.8.8" > /etc/resolv.conf
/sbin/ip route del default
fi
bash /etc/opt/netconfigure
set -e
### Include Bootstrap VM script
### Contain function-common
## https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
${function_common_content}
${base_setup_content}
download_playbook
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-vm-bootstrap.yml -i hosts --connection=local
# Check if playbook has been correctly extracted
ANSIBLE_CRON_FILE="/etc/cron.d/ansible-vm-bootstrap"
COUNT=$(ls /opt/slapos.playbook | wc -l)
if [[ ! $COUNT -gt 1 ]]
then
rm -f $ANSIBLE_CRON_FILE
rm -f /opt/slapos.playbook/playbook.tar.gz
exit 1
fi
# check if Ansible cron task was added
if [[ ! -s "$ANSIBLE_CRON_FILE" ]]
then
exit 1
fi
exit 0
\ No newline at end of file
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
download_playbook
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-re6stnet.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
download_playbook
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-server.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
download_playbook
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-server-update.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
download_playbook
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-vm-bootstrap.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
download_playbook
clear
echo "Starting Ansible playbook:"
ansible-playbook imt-vm-cloudera-manager.yml -i hosts --connection=local
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook re6stnet.yml -i hosts --connection=local
\ No newline at end of file
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook slapos.yml -i hosts --connection=local
\ No newline at end of file
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook slapos-master-standalone.yml -i hosts --connection=local
\ No newline at end of file
#!/bin/bash
set -e
#
# Paste content of function-common
# https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/roles/install-script/files/function-common
#
${function_common_content}
${base_setup_content}
${slapos_install_content}
clear
echo "Starting Ansible playbook:"
ansible-playbook slapos-test-node.yml -i hosts --connection=local
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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