Skip to content

E
erp5
Commit c3da6225 authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

Added History view action to Web Site, Web Section and Web Page types. 

Renamed SQL connector to comply with ERP5 naming conventions.
Removed SQL connnector from business template.
Fix some API function missbehaving when called in contexts outside website.
Renamed WebSite_getDefaultDocument to WebSite_getDefaultDocumentValue to match behaviour.
WebSite_getSite : Likewise.
Added WebSite_getDefaultDocument.
WebSite_getSiteValue : Likewise.
Fixed sections sometimes failing to get the default content.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6162 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8722b7bc
Hide whitespace changes
Inline Side-by-side
Showing with 800 additions and 55 deletions
bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml 0 → 100755
View file @ c3da6225
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.ActionInformation</string>
<string>ActionInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</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> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>history</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>5.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>History</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.Expression</string>
<string>Expression</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Base_viewHistory</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
View file @ c3da6225
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>5.0</float> </value> <value> <float>6.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/history.xml 0 → 100755
View file @ c3da6225
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.ActionInformation</string>
<string>ActionInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</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> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>history</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>4.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>History</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.Expression</string>
<string>Expression</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Base_viewHistory</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/metadata.xml
View file @ c3da6225
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>4.0</float> </value> <value> <float>5.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/history.xml 0 → 100755
View file @ c3da6225
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.ActionInformation</string>
<string>ActionInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</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> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>history</string> </value>
</item>
<item>
<key> <string>optional</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>History</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.Expression</string>
<string>Expression</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Base_viewHistory</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/metadata.xml
View file @ c3da6225
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>3.0</float> </value> <value> <float>4.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml
View file @ c3da6225
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
<value> <string>erp5_deferred_mysql</string> </value> <value> <string>erp5_deferred_sql_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml
View file @ c3da6225
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
<value> <string>erp5_deferred_mysql</string> </value> <value> <string>erp5_deferred_sql_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
View file @ c3da6225
...@@ -98,7 +98,7 @@ SearchableText</string> </value> ...@@ -98,7 +98,7 @@ SearchableText</string> </value>
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
<value> <string>erp5_deferred_mysql</string> </value> <value> <string>erp5_deferred_sql_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml
View file @ c3da6225
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
<value> <string>erp5_deferred_mysql</string> </value> <value> <string>erp5_deferred_sql_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
View file @ c3da6225
...@@ -502,4 +502,4 @@ ...@@ -502,4 +502,4 @@
</permission_list> </permission_list>
<portal_type>Web Site Module</portal_type> <portal_type>Web Site Module</portal_type>
<title>Web Sites</title> <title>Web Sites</title>
</module> </module>
\ No newline at end of file
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/listbox.xml
View file @ c3da6225
...@@ -345,6 +345,10 @@ ...@@ -345,6 +345,10 @@
<string>short_title</string> <string>short_title</string>
<string>Short Title</string> <string>Short Title</string>
</tuple> </tuple>
<tuple>
<string>validation_state</string>
<string>Valisation State</string>
</tuple>
<tuple> <tuple>
<string>portal_type</string> <string>portal_type</string>
<string>Type</string> <string>Type</string>
...@@ -535,6 +539,10 @@ ...@@ -535,6 +539,10 @@
<string>short_title</string> <string>short_title</string>
<string>WebSite_getListboxUrl</string> <string>WebSite_getListboxUrl</string>
</tuple> </tuple>
<tuple>
<string>validation_state</string>
<string>WebSite_getListboxUrl</string>
</tuple>
<tuple> <tuple>
<string>portal_type</string> <string>portal_type</string>
<string>WebSite_getListboxUrl</string> <string>WebSite_getListboxUrl</string>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
View file @ c3da6225
...@@ -85,7 +85,7 @@ new_content.setVersion(version)\n ...@@ -85,7 +85,7 @@ new_content.setVersion(version)\n
new_content.setLanguage(language)\n new_content.setLanguage(language)\n
new_content.setTextContent(context.getTextContent())\n new_content.setTextContent(context.getTextContent())\n
\n \n
redirect_url = new_content.WebSite_getDocumentUrl()\n redirect_url = new_content.WebSite_getDocumentPhysicalUrl()\n
context.log(\'WebSite_createContent\',\'redirect_url = %s\' % redirect_url)\n context.log(\'WebSite_createContent\',\'redirect_url = %s\' % redirect_url)\n
return request.RESPONSE.redirect( redirect_url )\n return request.RESPONSE.redirect( redirect_url )\n
</string> </value> </string> </value>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml 0 → 100755
View file @ c3da6225
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value> <string encoding="base64">bfINCg==</string> </value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.WebSite_getDefaultDocumentValue().WebSite_getUrl()\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocument</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebSite_getDefaultDocument</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml 0 → 100755
View file @ c3da6225
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value> <string encoding="base64">bfINCg==</string> </value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
The purpose of this method is to get a default content for a given section.\n
Multiple strategies can be implemented. For example, if the default\n
content points to an actual document, the reference of this document\n
is used to search in the catalog for the latest version in the appropriate\n
language.\n
\n
This method can be customised for every Web site\n
"""\n
\n
source_value = context.getDefaultSourceValue()\n
\n
if source_value is not None:\n
return source_value \n
\n
return None\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocumentValue</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>source_value</string>
<string>None</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebSite_getDefaultDocumentValue</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
View file @ c3da6225
...@@ -69,10 +69,9 @@ ...@@ -69,10 +69,9 @@
<value> <string>if reference_path is None:\n <value> <string>if reference_path is None:\n
reference_path = context\n reference_path = context\n
section = reference_path.WebSite_getSectionValue()\n section = reference_path.WebSite_getSectionValue()\n
if section is None:\n document = context.WebSite_getDocumentValue()\n
section = context.WebSite_getSite()\n if section is not None and document is not None:\n
if context.WebSite_getDocumentValue() is not None:\n return "%s/%s" % (section.WebSite_getUrl(), document.getRelativeUrl())\n
return "%s/%s" % (section.WebSite_getUrl(),context.WebSite_getDocumentValue().getRelativeUrl())\n
return None\n return None\n
</string> </value> </string> </value>
</item> </item>
...@@ -125,6 +124,7 @@ return None\n ...@@ -125,6 +124,7 @@ return None\n
<string>context</string> <string>context</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>section</string> <string>section</string>
<string>document</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml
View file @ c3da6225
...@@ -66,8 +66,9 @@ ...@@ -66,8 +66,9 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if context.WebSite_getDocumentValue() is not None:\n <value> <string>document = context.WebSite_getDocumentValue()\n
return context.WebSite_getDocumentValue().WebSite_getUrl()\n if document is not None:\n
return document.WebSite_getUrl()\n
return context.WebSite_getUrl()\n return context.WebSite_getUrl()\n
</string> </value> </string> </value>
</item> </item>
...@@ -117,6 +118,7 @@ return context.WebSite_getUrl()\n ...@@ -117,6 +118,7 @@ return context.WebSite_getUrl()\n
<tuple> <tuple>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>document</string>
<string>None</string> <string>None</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml
View file @ c3da6225
...@@ -66,8 +66,9 @@ ...@@ -66,8 +66,9 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if context.WebSite_getSectionValue() is not None:\n <value> <string>section = context.WebSite_getSectionValue()\n
return context.WebSite_getSectionValue().getTitle()\n if section is not None:\n
return section.getTitle()\n
return None\n return None\n
</string> </value> </string> </value>
</item> </item>
...@@ -116,7 +117,8 @@ return None\n ...@@ -116,7 +117,8 @@ return None\n
<value> <value>
<tuple> <tuple>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>section</string>
<string>None</string> <string>None</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
View file @ c3da6225
...@@ -66,14 +66,11 @@ ...@@ -66,14 +66,11 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>while context is not None and context.getPortalType() not in (\'Web Section\', \'Web Site\'):\n <value> <string>while hasattr(context, \'getPortalType\'):\n
if context.getPortalType() == \'Web Section\':\n
return context\n
context = context.getParent()\n context = context.getParent()\n
\n return None\n
if context is None:\n
return None\n
if context.getPortalType() == \'Web Site\':\n
return None\n
return context\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -120,9 +117,10 @@ return context\n ...@@ -120,9 +117,10 @@ return context\n
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>hasattr</string>
<string>context</string> <string>context</string>
<string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>None</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
View file @ c3da6225
...@@ -66,11 +66,10 @@ ...@@ -66,11 +66,10 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>current_section = context\n <value> <string>site = context.WebSite_getSiteValue()\n
while current_section is not None and current_section.getPortalType() != \'Web Site\':\n if site is not None:\n
current_section = current_section.getParent()\n return site.getTitle()\n
\n return None\n
return current_section\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -117,10 +116,10 @@ return current_section\n ...@@ -117,10 +116,10 @@ return current_section\n
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>context</string>
<string>current_section</string>
<string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string>
<string>site</string>
<string>None</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml 0 → 100755
View file @ c3da6225
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value> <string encoding="base64">bfINCg==</string> </value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>while hasattr(context, \'getPortalType\'):\n
if context.getPortalType() == \'Web Site\':\n
return context\n
context = context.getParent()\n
return None\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSiteValue</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>hasattr</string>
<string>context</string>
<string>_getattr_</string>
<string>None</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebSite_getSiteValue</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
View file @ c3da6225
...@@ -67,16 +67,19 @@ ...@@ -67,16 +67,19 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>path_list = []\n <value> <string>path_list = []\n
parent_portal_type = \'\'\n
\n \n
for crumb in context.WebSite_getBreadcrumbValue():\n for crumb in context.WebSite_getBreadcrumbValue():\n
if crumb.getPortalType() == \'Web Site\':\n portal_type = crumb.getPortalType()\n
path_list = [context.WebSite_getSite().absolute_url()]\n if portal_type == \'Web Site\':\n
elif hasattr(crumb, \'default_reference\') and \\\n path_list = [context.WebSite_getSiteValue().absolute_url()]\n
crumb.getPortalType() == \'Web Page\' and \\\n elif portal_type == \'Web Page\' and \\\n
\'Module\' not in crumb.getParent().getPortalType():\n hasattr(crumb, \'default_reference\') and \\\n
\'Module\' not in parent_portal_type:\n
path_list.append(crumb.getReference())\n path_list.append(crumb.getReference())\n
else:\n else:\n
path_list.append(crumb.getId())\n path_list.append(crumb.getId())\n
parent_portal_type = portal_type\n
\n \n
return \'/\'.join(path_list)\n return \'/\'.join(path_list)\n
</string> </value> </string> </value>
...@@ -126,10 +129,12 @@ return \'/\'.join(path_list)\n ...@@ -126,10 +129,12 @@ return \'/\'.join(path_list)\n
<value> <value>
<tuple> <tuple>
<string>path_list</string> <string>path_list</string>
<string>parent_portal_type</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>crumb</string> <string>crumb</string>
<string>portal_type</string>
<string>hasattr</string> <string>hasattr</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
View file @ c3da6225
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<tal:block tal:define="default_content here/WebSite_getDefaultDocument | nothing;\n <tal:block tal:define="default_content here/WebSite_getDefaultDocumentValue | nothing;\n
layout_form_id here/getApplicableLayout | nothing;\n layout_form_id here/getApplicableLayout | nothing;\n
ignore_layout request/ignore_layout | nothing;\n ignore_layout request/ignore_layout | nothing;\n
editable_mode request/editable_mode | nothing;\n editable_mode request/editable_mode | nothing;\n
...@@ -62,21 +62,16 @@ ...@@ -62,21 +62,16 @@
layout_id layout_form/pt | string:view_master;">\n layout_id layout_form/pt | string:view_master;">\n
<tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:fill-slot="main">\n
<tal:block tal:condition="not: editable_mode">\n <tal:block tal:condition="python:(not editable_mode) and (not ignore_layout) and default_content is not None">\n
<tal:block tal:condition="python:(not ignore_layout) and default_content">\n <tal:block tal:define="global here python:default_content;\n
<tal:block tal:define="here python:default_content;\n global form python:here.WebPage_view;\n
form python:here.WebPage_view;\n global default_content_title python:here.getTitle()"/>\n
default_content_title python:here.getTitle()">\n
<tal:block metal:use-macro="here/form_view/macros/form_render" />\n
</tal:block>\n
</tal:block>\n
<tal:block tal:condition="python: ignore_layout or (not default_content)">\n
<tal:block metal:use-macro="here/form_view/macros/form_render" />\n
</tal:block>\n
</tal:block>\n
<tal:block tal:condition="editable_mode">\n
<tal:block metal:use-macro="here/form_view/macros/form_render" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:replace="here/getPath"/><br/>\n
<tal:block tal:condition="not: editable_mode">not </tal:block>editable_mode<br/>\n
<tal:block tal:condition="not: ignore_layout">not </tal:block>ignore_layout<br/>\n
<tal:block tal:replace="default_content/getPath"/><br/>\n
<tal:block metal:use-macro="here/form_view/macros/form_render" />\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block> </tal:block>
......
bt5/erp5_web/bt/template_path_list
View file @ c3da6225
erp5_deferred_mysql
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7