Commit 16408ff8 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

erp5_officejs_appstore_base: Put all apps in one website

parent ef54976b
...@@ -109,7 +109,9 @@ ...@@ -109,7 +109,9 @@
</item> </item>
<item> <item>
<key> <string>text_content_substitution_mapping_method_id</string> </key> <key> <string>text_content_substitution_mapping_method_id</string> </key>
<value> <string>WebPage_getRenderJSSubstitutionMappingDict</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -230,7 +232,7 @@ ...@@ -230,7 +232,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>supercedriclen</string> </value> <value> <string>cedric.le.ninivin</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -244,7 +246,7 @@ ...@@ -244,7 +246,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>951.19443.53509.7185</string> </value> <value> <string>958.21401.8615.61559</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -262,7 +264,7 @@ ...@@ -262,7 +264,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1463665193.7</float> <float>1493976571.58</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Site" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Authenticated</string>
<string>Author</string>
<string>Manager</string>
<string>Member</string>
<string>Owner</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Authenticated</string>
<string>Author</string>
<string>Manager</string>
<string>Member</string>
<string>Owner</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>__before_publishing_traverse__</string> </key>
<value>
<object>
<klass>
<global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_defined_in_class</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>_hookname</string> </key>
<value> <string>__before_publishing_traverse__</string> </value>
</item>
<item>
<key> <string>_list</string> </key>
<value>
<list>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</list>
</value>
</item>
<item>
<key> <string>_prior</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>__before_traverse__</string> </key>
<value>
<dictionary>
<item>
<key>
<tuple>
<int>99</int>
<string>ERP5 Web Site/application-list</string>
</tuple>
</key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
<item>
<key> <string>available_language</string> </key>
<value>
<tuple>
<string>fr</string>
<string>en</string>
<string>zh</string>
</tuple>
</value>
</item>
<item>
<key> <string>container_layout</string> </key>
<value> <string>erp5_web_layout</string> </value>
</item>
<item>
<key> <string>content_layout</string> </key>
<value> <string>erp5_web_content_layout</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>application-list</string> </value>
</item>
<item>
<key> <string>layout_configuration_form_id</string> </key>
<value> <string>WebSection_viewDefaultThemeConfiguration</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Site</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>static_language_selection</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Liste des Applications OfficeJS</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="WebSiteTraversalHook" module="Products.ERP5.Document.WebSite"/>
</pickle>
<pickle>
<dictionary/>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<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="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<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="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="8" aka="AAAAAAAAAAg=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>category_publication_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="9" aka="AAAAAAAAAAk=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>publish</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>cedric.le.ninivin</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1495187372.09</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>published</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="10" aka="AAAAAAAAAAo=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>cedric.le.ninivin</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>959.30571.40365.35123</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1495185352.08</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="Static Web Section" module="erp5.portal_type"/> <global name="Web Section" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -109,69 +109,47 @@ ...@@ -109,69 +109,47 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>_identity_criterion</string> </key> <key> <string>_count</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>_local_properties</string> </key> <key> <string>_identity_criterion</string> </key>
<value> <value>
<tuple> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<dictionary> </value>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_x_frame_options</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_content_security_policy</string> </value>
</item> </item>
<item> <item>
<key> <string>type</string> </key> <key> <string>_mt_index</string> </key>
<value> <string>string</string> </value> <value>
</item> <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</dictionary>
</tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>_range_criterion</string> </key> <key> <string>_range_criterion</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>configuration_content_security_policy</string> </key> <key> <string>_tree</string> </key>
<value> <string>default-src * \'self\' \'unsafe-inline\' \'unsafe-eval\' data: blob:</string> </value> <value>
</item> <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
<item> </value>
<key> <string>configuration_x_frame_options</string> </key>
<value> <string>ALLOW-FROM-ALL</string> </value>
</item>
<item>
<key> <string>container_layout</string> </key>
<value> <string>WebSection_renderDefaultPageAsGadget</string> </value>
</item>
<item>
<key> <string>content_layout</string> </key>
<value> <string>WebSection_renderDefaultPageAsGadget</string> </value>
</item> </item>
<item> <item>
<key> <string>custom_render_method_id</string> </key> <key> <string>categories</string> </key>
<value> <string>WebSection_renderDefaultPageAsGadget</string> </value> <value>
<tuple>
<string>aggregate/web_page_module/gadget_ojs_appstore_redirect_page_html</string>
<string>caching_policy/must-revalidate</string>
</tuple>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <value> <string>Template used to create WebSite</string> </value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>empty_criterion_valid</string> </key> <key> <string>empty_criterion_valid</string> </key>
...@@ -181,9 +159,15 @@ ...@@ -181,9 +159,15 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>template</string> </value> <value> <string>template</string> </value>
</item> </item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Static Web Section</string> </value> <value> <string>Web Section</string> </value>
</item> </item>
<item> <item>
<key> <string>short_title</string> </key> <key> <string>short_title</string> </key>
...@@ -193,7 +177,7 @@ ...@@ -193,7 +177,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Template Section</string> </value> <value> <string>Template</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
...@@ -202,7 +186,7 @@ ...@@ -202,7 +186,7 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -217,6 +201,12 @@ ...@@ -217,6 +201,12 @@
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -231,7 +221,15 @@ ...@@ -231,7 +221,15 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -246,7 +244,15 @@ ...@@ -246,7 +244,15 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="5" aka="AAAAAAAAAAU="> <record id="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="8" aka="AAAAAAAAAAg=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -259,13 +265,13 @@ ...@@ -259,13 +265,13 @@
<item> <item>
<key> <string>category_publication_workflow</string> </key> <key> <string>category_publication_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>edit_workflow</string> </key> <key> <string>edit_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -274,7 +280,7 @@ ...@@ -274,7 +280,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="6" aka="AAAAAAAAAAY="> <record id="9" aka="AAAAAAAAAAk=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
...@@ -313,7 +319,7 @@ ...@@ -313,7 +319,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1490973336.84</float> <float>1495185385.45</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -329,7 +335,7 @@ ...@@ -329,7 +335,7 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="7" aka="AAAAAAAAAAc="> <record id="10" aka="AAAAAAAAAAo=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
...@@ -349,7 +355,7 @@ ...@@ -349,7 +355,7 @@
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -358,7 +364,7 @@ ...@@ -358,7 +364,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>958.24468.20075.50363</string> </value> <value> <string>0.0.0.0</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -376,7 +382,7 @@ ...@@ -376,7 +382,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1490973460.32</float> <float>1495185385.46</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -388,4 +394,36 @@ ...@@ -388,4 +394,36 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="11" aka="AAAAAAAAAAs=">
<pickle>
<global name="Message" module="Products.ERP5Type.Message"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string>Object copied from ${source_item}</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>source_item</string> </key>
<value> <string>/erp5/web_site_module/application-list-old/template</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>message</string> </key>
<value> <string>Object copied from ${source_item}</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="Web Site" module="erp5.portal_type"/> <global name="Static Web Section" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<key> <key>
<tuple> <tuple>
<int>99</int> <int>99</int>
<string>ERP5 Web Site/officejs_app_template</string> <string>ERP5 Web Section/template</string>
</tuple> </tuple>
</key> </key>
<value> <value>
...@@ -108,16 +108,10 @@ ...@@ -108,16 +108,10 @@
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>_identity_criterion</string> </key> <key> <string>_identity_criterion</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -127,7 +121,7 @@ ...@@ -127,7 +121,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>configuration_content_security_policy</string> </value> <value> <string>configuration_x_frame_options</string> </value>
</item> </item>
<item> <item>
<key> <string>type</string> </key> <key> <string>type</string> </key>
...@@ -137,7 +131,7 @@ ...@@ -137,7 +131,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>configuration_latest_version</string> </value> <value> <string>configuration_content_security_policy</string> </value>
</item> </item>
<item> <item>
<key> <string>type</string> </key> <key> <string>type</string> </key>
...@@ -147,7 +141,7 @@ ...@@ -147,7 +141,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>configuration_x_frame_options</string> </value> <value> <string>configuration_base_reference</string> </value>
</item> </item>
<item> <item>
<key> <string>type</string> </key> <key> <string>type</string> </key>
...@@ -157,48 +151,27 @@ ...@@ -157,48 +151,27 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>_range_criterion</string> </key> <key> <string>_range_criterion</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
<item>
<key> <string>available_language</string> </key>
<value>
<tuple>
<string>en</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>caching_policy/must-revalidate</string> <string>caching_policy/one-year-cache</string>
<string>aggregate/web_page_module/gadget_ojs_appstore_redirect_page_html</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>configuration_content_security_policy</string> </key> <key> <string>configuration_base_reference</string> </key>
<value> <string>default-src * \'self\' \'unsafe-inline\' \'unsafe-eval\'</string> </value> <value> <string>template/</string> </value>
</item> </item>
<item> <item>
<key> <string>configuration_latest_version</string> </key> <key> <string>configuration_content_security_policy</string> </key>
<value> <string>development</string> </value> <value> <string>default-src * \'self\' \'unsafe-inline\' \'unsafe-eval\' data: blob:</string> </value>
</item> </item>
<item> <item>
<key> <string>configuration_x_frame_options</string> </key> <key> <string>configuration_x_frame_options</string> </key>
...@@ -206,15 +179,23 @@ ...@@ -206,15 +179,23 @@
</item> </item>
<item> <item>
<key> <string>container_layout</string> </key> <key> <string>container_layout</string> </key>
<value> <string>WebSection_renderOfficeJSApplicationPage</string> </value> <value> <string>File_viewAsWeb</string> </value>
</item> </item>
<item> <item>
<key> <string>content_layout</string> </key> <key> <string>content_layout</string> </key>
<value> <string>WebSection_renderOfficeJSApplicationPage</string> </value> <value> <string>File_viewAsWeb</string> </value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple>
<string>version</string>
</tuple>
</value>
</item> </item>
<item> <item>
<key> <string>custom_render_method_id</string> </key> <key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_renderOfficeJSApplicationPage</string> </value> <value> <string>File_viewAsWeb</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -222,33 +203,69 @@ ...@@ -222,33 +203,69 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>empty_criterion_valid</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>officejs_app_template</string> </value> <value> <string>template</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>layout_configuration_form_id</string> </key> <key> <string>layout_configuration_form_id</string> </key>
<value> <string>WebSection_viewOfficeJSApplicationPreference</string> </value> <value> <string>WebSection_viewOfficeJSApplicationPreference</string> </value>
</item> </item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple>
<string>follow_up</string>
</tuple>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Web Site</string> </value> <value> <string>Static Web Section</string> </value>
</item> </item>
<item> <item>
<key> <string>short_title</string> </key> <key> <string>short_title</string> </key>
<value> <string>Application Template</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>skin_selection_name</string> </key> <key> <string>string_index</string> </key>
<value> <string>RJS</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>static_language_selection</string> </key> <key> <string>test_method_id</string> </key>
<value> <int>1</int> </value> <value>
<tuple/>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>OfficeJS Application Template</string> </value> <value> <string>Template Web Section</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
...@@ -257,7 +274,7 @@ ...@@ -257,7 +274,7 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -265,19 +282,13 @@ ...@@ -265,19 +282,13 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<global name="WebSiteTraversalHook" module="Products.ERP5.Document.WebSite"/> <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary/> <dictionary/>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -286,21 +297,20 @@ ...@@ -286,21 +297,20 @@
<item> <item>
<key> <string>data</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary/> <dictionary>
<item>
<key> <string>version</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="5" aka="AAAAAAAAAAU="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -315,15 +325,7 @@ ...@@ -315,15 +325,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="7" aka="AAAAAAAAAAc="> <record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="8" aka="AAAAAAAAAAg=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -336,13 +338,13 @@ ...@@ -336,13 +338,13 @@
<item> <item>
<key> <string>category_publication_workflow</string> </key> <key> <string>category_publication_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>edit_workflow</string> </key> <key> <string>edit_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -351,7 +353,7 @@ ...@@ -351,7 +353,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="9" aka="AAAAAAAAAAk="> <record id="6" aka="AAAAAAAAAAY=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
...@@ -390,7 +392,7 @@ ...@@ -390,7 +392,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1458146479.16</float> <float>1495185385.46</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -406,7 +408,7 @@ ...@@ -406,7 +408,7 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="10" aka="AAAAAAAAAAo="> <record id="7" aka="AAAAAAAAAAc=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
...@@ -426,7 +428,7 @@ ...@@ -426,7 +428,7 @@
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -435,7 +437,9 @@ ...@@ -435,7 +437,9 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>958.24467.40344.6724</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -453,7 +457,7 @@ ...@@ -453,7 +457,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1490973425.66</float> <float>1495185385.48</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -465,4 +469,36 @@ ...@@ -465,4 +469,36 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="8" aka="AAAAAAAAAAg=">
<pickle>
<global name="Message" module="Products.ERP5Type.Message"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string>Object copied from ${source_item}</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>source_item</string> </key>
<value> <string>/erp5/web_site_module/application-list-old/template</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>message</string> </key>
<value> <string>Object copied from ${source_item}</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
portal = context.getPortalObject() portal = context.getPortalObject()
web_site = context.getFollowUpValue(portal_type="Web Site") web_site = context.getFollowUpValue(portal_type="Web Section")
# Create Web Site if necessary # Create Web Site if necessary
if not web_site: if not web_site:
# XXX Hardcoded templ # XXX Hardcoded templ
web_site = portal.web_site_module.officejs_app_template.Base_createCloneDocument(batch_mode=True) web_site = portal.web_site_module['application-list'].template.Base_createCloneDocument(batch_mode=True)
web_site.edit( web_site.edit(
title=context.getTitle(), title=context.getTitle(),
short_title=context.getTitle(), short_title=context.getTitle(),
...@@ -17,8 +17,5 @@ if not web_site: ...@@ -17,8 +17,5 @@ if not web_site:
if not web_site.getId() == context.getReference().lower(): if not web_site.getId() == context.getReference().lower():
web_site.setId(context.getReference().lower()) web_site.setId(context.getReference().lower())
if portal.portal_workflow.isTransitionPossible(web_site, 'publish'):
web_site.publish()
if batch_mode: if batch_mode:
return web_site return web_site
return context.getFollowUpValue(portal_type="Web Site") return context.getFollowUpValue(portal_type="Web Section")
raise ValueError("Unimplemented") raise ValueError("Unimplemented")
...@@ -85,15 +85,14 @@ ...@@ -85,15 +85,14 @@
<list> <list>
<string>listbox_delivery_start_date</string> <string>listbox_delivery_start_date</string>
<string>listbox_delivery_stop_date</string> <string>listbox_delivery_stop_date</string>
<string>listbox_modification_date</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list/>
<string>listbox_modification_date</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -5,11 +5,11 @@ software_publication_line = software_publication_line_list[0] ...@@ -5,11 +5,11 @@ software_publication_line = software_publication_line_list[0]
software_release = software_publication_line.getAggregateValue(portal_type="Software Release") software_release = software_publication_line.getAggregateValue(portal_type="Software Release")
software_product = software_publication_line.getResourceValue(portal_type="Software Product") software_product = software_publication_line.getResourceValue(portal_type="Software Product")
if not software_product or not software_release: if not software_product or not software_release or not software_product.getFollowUpId(portal_type="Web Section"):
return return
software_release_version = software_release.getReference() # XXX Hardcoded
#if as_link: return "https://%s.app.officejs.com/%s/" % (
# return '<a href="%(link)s">%(link)s</a>' % {"link": (software_product.getFollowUpValue(portal_type="Web Site")[software_release_version].absolute_url() + "/")} software_product.getFollowUpId(portal_type="Web Section"),
software_release.getReference(),
return software_product.getFollowUpValue(portal_type="Web Site")[software_release_version].absolute_url() + "/" )
...@@ -58,6 +58,7 @@ base_length = len(base) ...@@ -58,6 +58,7 @@ base_length = len(base)
software_release_url = software_release.getRelativeUrl() software_release_url = software_release.getRelativeUrl()
tag = "preparing_sr_%s" % software_release_url tag = "preparing_sr_%s" % software_release_url
default_page = ""
for name in zip_reader.namelist(): for name in zip_reader.namelist():
if zip_reader.getinfo(name).file_size == 0: if zip_reader.getinfo(name).file_size == 0:
continue continue
...@@ -84,12 +85,14 @@ for name in zip_reader.namelist(): ...@@ -84,12 +85,14 @@ for name in zip_reader.namelist():
# XX Hackish # XX Hackish
document.setCategoryList( document.setCategoryList(
document.getCategoryList() + ["contributor/" + software_publication.getSource()]) document.getCategoryList() + ["contributor/" + software_publication.getSource()])
document.activate(tag=tag).submit() if url in ("index.html", "index.htm"):
default_page = document.getRelativeUrl()
document.activate(tag=tag).publish()
software_release.activate(after_tag=tag, tag=tag + "_2").SoftwareRelease_fixRelatedWebSection() software_release.SoftwareRelease_fixRelatedWebSection(default_page=default_page)
if portal.portal_workflow.isTransitionPossible(zip_file, 'submit'): if portal.portal_workflow.isTransitionPossible(zip_file, 'publish'):
zip_file.submit() zip_file.publish()
if portal.portal_workflow.isTransitionPossible(software_release, 'submit'): if portal.portal_workflow.isTransitionPossible(software_release, 'submit'):
software_release.submit() software_release.submit()
software_publication.activate(after_tag=tag + "_2").submit() software_publication.activate(after_tag=tag).submit()
...@@ -6,15 +6,12 @@ software_product = software_release.getFollowUpValue(portal_type="Software Produ ...@@ -6,15 +6,12 @@ software_product = software_release.getFollowUpValue(portal_type="Software Produ
web_site = software_product.SoftwareProduct_fixRelatedWebSite(batch_mode=True) web_site = software_product.SoftwareProduct_fixRelatedWebSite(batch_mode=True)
version = software_release.getReference() version = software_release.getReference()
context.log(version)
context.log("%s" % web_site.getRelativeUrl())
try: try:
web_section = web_site.restrictedTraverse(version) web_section = web_site.restrictedTraverse(version)
except KeyError: except KeyError:
source = portal.web_site_module.officejs_app_template web_section = web_site.template.Base_createCloneDocument(batch_mode=True)
clipboard = source.manage_copyObjects(ids=["template"])
context.REQUEST.set('__cp', clipboard) # CopySupport is using this to set
# tracebility information in edit_workflow history
paste_result = web_site.manage_pasteObjects(cb_copy_data=clipboard)
web_section = web_site[paste_result[0]['new_id']]
web_section.edit( web_section.edit(
id=version, id=version,
title=software_release.getVersion(), title=software_release.getVersion(),
...@@ -24,30 +21,26 @@ except KeyError: ...@@ -24,30 +21,26 @@ except KeyError:
# Update development section to use version and follow_up # Update development section to use version and follow_up
web_section.setCriterionPropertyList([ web_section.setCriterionPropertyList([
"version", "version",
"validation_state",
]) ])
web_section.setCriterion('version', version[:10]) web_section.setCriterion('version', version[:10])
web_section.setCriterion('validation_state', 'submitted')
web_section.setMembershipCriterionBaseCategoryList(['follow_up']) web_section.setMembershipCriterionBaseCategoryList(['follow_up'])
web_section.setMembershipCriterionCategoryList(['follow_up/' + context.getRelativeUrl()]) web_section.setMembershipCriterionCategoryList(['follow_up/' + context.getRelativeUrl()])
if portal.portal_workflow.isTransitionPossible(web_section, 'publish'): if not default_page:
web_section.publish() # Update default page for development version.
landing_publication_uid = portal.portal_categories.publication_section.application.landing_page.getUid()
# Update default page for development version. aggregate_list = portal.portal_catalog(
landing_publication_uid = portal.portal_categories.publication_section.application.landing_page.getUid()
aggregate_list = portal.portal_catalog(
portal_type="File", portal_type="File",
strict_follow_up_uid=context.getUid(), strict_follow_up_uid=context.getUid(),
strict_publication_section_uid=landing_publication_uid, strict_publication_section_uid=landing_publication_uid,
validation_state="submitted",
#XXX Hackish #XXX Hackish
sort_on=[("modification_date", "descending")], sort_on=[("modification_date", "descending")],
limit=1, limit=1,
select_list=["relative_url"], select_list=["relative_url"],
) )
if aggregate_list: if aggregate_list:
web_section.setAggregate(aggregate_list[0].relative_url) web_section.setAggregate(aggregate_list[0].relative_url)
else:
web_section.setAggregate(default_page)
return "Done" return "Done"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string>default_page=""</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
portal = context.getPortalObject() portal = context.getPortalObject()
software_release = context software_release = context
# Publish Web Document
web_document_list = portal.portal_catalog(
portal_type=portal.getPortalDocumentTypeList(),
strict_follow_up_uid=software_release.getUid(),
validation_state="submitted",
)
today = DateTime().earliestTime()
for web_document in web_document_list:
web_document.setEffectiveDate(today)
web_document.publish()
software_product = context.getFollowUpValue(portal_type="Software Product") software_product = context.getFollowUpValue(portal_type="Software Product")
web_site = software_product.SoftwareProduct_getRelatedWebSite() web_site = software_product.SoftwareProduct_getRelatedWebSite()
# Publish Web Site, Websection and update version
today = DateTime().earliestTime()
if web_site.getValidationState() != 'published':
web_site.setEffectiveDate(today)
web_site.publish()
version_web_section = web_site[software_release.getReference()]
version_web_section.setCriterion('validation_state', 'published')
if portal.portal_workflow.isTransitionPossible(version_web_section, 'publish'):
version_web_section.publish()
def webSectionUpdatePredicate(current_section):
current_section.setCriterion('validation_state', 'published')
for child_section in current_section.objectValues(portal_type="Web Section"):
webSectionUpdatePredicate(child_section)
webSectionUpdatePredicate(version_web_section)
web_site.edit( web_site.edit(
configuration_latest_version=software_release.getVersion(), configuration_latest_version=software_release.getReference(),
) )
# Update appcache # Update appcache
......
...@@ -8,6 +8,6 @@ web_section = REQUEST.get("current_web_section") ...@@ -8,6 +8,6 @@ web_section = REQUEST.get("current_web_section")
#raise ValueError(web_section.getLayoutProperty("configuration_latest_version", default="development")) #raise ValueError(web_section.getLayoutProperty("configuration_latest_version", default="development"))
return default_web_page.WebPage_viewAsWeb(mapping_dict={ return default_web_page.WebPage_viewAsWeb(mapping_dict={
#"latest_version": web_section.getLayoutProperty("configuration_latest_version", default="development"), "latest_version": web_section.getLayoutProperty("configuration_latest_version", default="development"),
#"application_appcache": web_section.getId() + ".appcache", #"application_appcache": web_section.getId() + ".appcache",
}) })
web_page_module/gadget_ojs_* web_page_module/gadget_ojs_*
web_site_module/officejs_appstore web_site_module/officejs_appstore
web_site_module/officejs_appstore/** web_site_module/officejs_appstore/**
web_site_module/officejs_app_template web_site_module/application-list
web_site_module/officejs_app_template/** web_site_module/application-list/template
\ No newline at end of file web_site_module/application-list/template/**
\ No newline at end of file
web_site_module/officejs_app_template
web_site_module/officejs_app_template/**
\ No newline at end of file
web_page_module/gadget_ojs_* web_page_module/gadget_ojs_*
web_site_module/officejs_appstore web_site_module/officejs_appstore
web_site_module/officejs_appstore/** web_site_module/officejs_appstore/**
web_site_module/officejs_app_template web_site_module/application-list
web_site_module/officejs_app_template/** web_site_module/application-list/template
\ No newline at end of file web_site_module/application-list/template/**
\ No newline at end of file
...@@ -3,7 +3,8 @@ portal_categories/product_line/software ...@@ -3,7 +3,8 @@ portal_categories/product_line/software
portal_categories/product_line/software/** portal_categories/product_line/software/**
portal_categories/publication_section/** portal_categories/publication_section/**
web_page_module/gadget_ojs_* web_page_module/gadget_ojs_*
web_site_module/officejs_app_template web_site_module/application-list
web_site_module/officejs_app_template/** web_site_module/application-list/template
web_site_module/application-list/template/**
web_site_module/officejs_appstore web_site_module/officejs_appstore
web_site_module/officejs_appstore/** web_site_module/officejs_appstore/**
\ No newline at end of file
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