diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml index 8c8d288c8364a2137252071c1a78f0c503f26956..0139ca71f1e44a2456c60fc6041e5cdab12b4796 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml @@ -88,7 +88,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: object is not None and object.isWebMode()</string> </value> + <value> <string>python: object is not None and object.isWebMode() and not object.isEditableMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml index 3086d6dc77c21e6ef3a7ab3639816dddd0e59fb5..8cd8635c53abaa51f0a10bb58b6fc1f4f0fd7e30 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml @@ -2,10 +2,14 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <global name="ERP5Form" module="Products.ERP5Form.Form"/> + <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> @@ -19,7 +23,24 @@ <item> <key> <string>_asgns</string> </key> <value> - <dictionary/> + <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> @@ -28,92 +49,21 @@ </value> </item> <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> + <key> <string>_body</string> </key> + <value> <string>"""\n + Return default rendering of Web Site for KM.\n +"""\n +return context()\n +</string> </value> </item> <item> - <key> <string>action</string> </key> - <value> <string>Base_edit</string> </value> - </item> - <item> - <key> <string>encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>enctype</string> </key> + <key> <string>_params</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>group_list</string> </key> - <value> - <list> - <string>webcontent header bottom</string> - <string>webcontent bottom</string> - </list> - </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <dictionary> - <item> - <key> <string>webcontent bottom</string> </key> - <value> - <list> - <string>my_description</string> - <string>listbox</string> - </list> - </value> - </item> - <item> - <key> <string>webcontent header bottom</string> </key> - <value> - <list> - <string>my_title</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>WebSite_viewAsWeb</string> </value> </item> - <item> - <key> <string>method</string> </key> - <value> <string>POST</string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string>WebSite_viewAsWeb</string> </value> - </item> - <item> - <key> <string>pt</string> </key> - <value> <string>form_view</string> </value> - </item> - <item> - <key> <string>row_length</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>stored_encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Web Site</string> </value> - </item> - <item> - <key> <string>unicode_mode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>update_action</string> </key> - <value> <string></string> </value> - </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml deleted file mode 100644 index cf9bddd3ed79a20a064baac0a98d44c1e435c989..0000000000000000000000000000000000000000 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml +++ /dev/null @@ -1,146 +0,0 @@ -<?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>selection_name</string> - <string>columns</string> - <string>sort</string> - <string>lines</string> - <string>portal_types</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>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>translated_title</string> - <string>Title</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - </list> - </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_viewWebFieldLibrary</string> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> <int>10</int> </value> - </item> - <item> - <key> <string>portal_types</string> </key> - <value> - <list> - <tuple> - <string>Web Section</string> - <string>Web Section</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string>site_section_selection</string> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>int_index</string> - <string>int_index</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>Site Sections</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/my_description.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/my_description.xml deleted file mode 100644 index 07946743a38e228a8d432a57bc06dcc3695c4de2..0000000000000000000000000000000000000000 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/my_description.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?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>description</string> - <string>title</string> - <string>whitespace_preserve</string> - <string>width</string> - <string>editable</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_description</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>description</string> </key> - <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_text_area_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>Description</string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>40</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/my_title.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/my_title.xml deleted file mode 100644 index 6c0347f66ae88c6af3826ba624c6c70d630a3bf0..0000000000000000000000000000000000000000 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/my_title.xml +++ /dev/null @@ -1,121 +0,0 @@ -<?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>description</string> - <string>title</string> - <string>default</string> - <string>css_class</string> - <string>editable</string> - <string>display_width</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_title</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>css_class</string> </key> - <value> <string>headline</string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string>Web Section</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>The name of a document in ERP5</string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <int>20</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_string_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>Title</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 09fef806d925ab6c7d7b6cb51aadc388545f3a45..b25dcc8ec22bf853e3c148dfd43955ec40310c9c 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -1035 \ No newline at end of file +1036 \ No newline at end of file