Commit 32a6ef42 authored by Vincent Pelletier's avatar Vincent Pelletier

Some improvements and many changes due to exported xml.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6658 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6b9f2ee9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDefaultDocument</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocument</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -87,7 +87,7 @@ return None\n ...@@ -87,7 +87,7 @@ return None\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocument</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocument</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -83,7 +83,7 @@ return None\n ...@@ -83,7 +83,7 @@ return None\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -81,7 +81,7 @@ return context.WebSite_getUrl()\n ...@@ -81,7 +81,7 @@ return context.WebSite_getUrl()\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentUrl</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentUrl</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
...@@ -91,7 +91,7 @@ return context.WebSite_getUrl()\n ...@@ -91,7 +91,7 @@ return context.WebSite_getUrl()\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string>**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -117,6 +117,7 @@ return context.WebSite_getUrl()\n ...@@ -117,6 +117,7 @@ return context.WebSite_getUrl()\n
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>kw</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>document</string> <string>document</string>
......
...@@ -69,10 +69,8 @@ ...@@ -69,10 +69,8 @@
<value> <string>portal_type = context.getPortalType()\n <value> <string>portal_type = context.getPortalType()\n
if portal_type == \'Web Site\':\n if portal_type == \'Web Site\':\n
return None\n return None\n
if portal_type == \'Web Section\':\n if portal_type == \'Web Section\' and not getattr(context.REQUEST, \'editable_mode\', None):\n
if context.REQUEST[\'editable_mode\']:\n return context.WebSite_getDefaultDocumentValue()\n
return context\n
return context.getDefaultSourceValue()\n
return context\n return context\n
</string> </value> </string> </value>
</item> </item>
...@@ -124,7 +122,7 @@ return context\n ...@@ -124,7 +122,7 @@ return context\n
<string>context</string> <string>context</string>
<string>portal_type</string> <string>portal_type</string>
<string>None</string> <string>None</string>
<string>_getitem_</string> <string>getattr</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -77,7 +77,13 @@ ...@@ -77,7 +77,13 @@
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentValueAsText</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentValueAsText</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
...@@ -108,7 +114,7 @@ ...@@ -108,7 +114,7 @@
<value> <value>
<tuple> <tuple>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -135,7 +135,7 @@ return brain_list\n ...@@ -135,7 +135,7 @@ return brain_list\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentValueList</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentValueList</string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
if brain is not None:\n if brain is not None:\n
o = brain.getObject()\n o = brain.getObject()\n
url = \'%s/%s\' % (context.REQUEST[\'URL1\'], o.getRelativeUrl())\n url = \'%s/%s\' % (context.REQUEST[\'URL1\'], o.getRelativeUrl())\n
if context.REQUEST.has_key(\'editable_mode\') and context.REQUEST[\'editable_mode\']:\n if getattr(context.REQUEST, \'editable_mode\', None):\n
url = \'%s/view?editable_mode=%s\' % (url, context.REQUEST[\'editable_mode\'])\n url = \'%s/view?editable_mode=%s\' % (url, context.REQUEST[\'editable_mode\'])\n
return url\n return url\n
</string> </value> </string> </value>
...@@ -83,7 +83,7 @@ return url\n ...@@ -83,7 +83,7 @@ return url\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getListboxUrl</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getListboxUrl</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
...@@ -127,6 +127,7 @@ return url\n ...@@ -127,6 +127,7 @@ return url\n
<string>o</string> <string>o</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>context</string> <string>context</string>
<string>getattr</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -81,7 +81,7 @@ return None\n ...@@ -81,7 +81,7 @@ return None\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSectionValue</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSectionValue</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -80,7 +80,7 @@ return None\n ...@@ -80,7 +80,7 @@ return None\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSite</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSite</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -81,7 +81,7 @@ return None\n ...@@ -81,7 +81,7 @@ return None\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSiteValue</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSiteValue</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -95,7 +95,7 @@ return \'/\'.join(path_list)\n ...@@ -95,7 +95,7 @@ return \'/\'.join(path_list)\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getUrl</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getUrl</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -84,7 +84,7 @@ return action\n ...@@ -84,7 +84,7 @@ return action\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_replaceActionUrl</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_replaceActionUrl</string> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>Python_magic</string> </key> <key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value> <value> <string encoding="base64">bfINCg==</string> </value>
</item> </item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
...@@ -77,11 +77,17 @@ ...@@ -77,11 +77,17 @@
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_viewSearchResult</string> </value> <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_viewSearchResult</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string>**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -107,10 +113,10 @@ ...@@ -107,10 +113,10 @@
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>kw</string>
<string>_apply_</string> <string>_apply_</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>kw</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
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