Commit 3cdcdec9 authored by Kevin Deldycke's avatar Kevin Deldycke

Revert changes (mistake: I was reading the diff in the wrong order...)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7702 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 19479af1
...@@ -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_sql_connection</string> </value> <value> <string>erp5_sql_deferred_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>uid</string> <string>uid</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -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_sql_connection</string> </value> <value> <string>erp5_sql_deferred_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>uid</string> <string>uid</string>
<string>SearchableText</string> <string>SearchableText</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -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_sql_connection</string> </value> <value> <string>erp5_sql_deferred_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -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_sql_connection</string> </value> <value> <string>erp5_sql_deferred_connection</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -79,11 +79,8 @@ dest = directory[paste_result[0][\'new_id\']]\n ...@@ -79,11 +79,8 @@ dest = directory[paste_result[0][\'new_id\']]\n
#if id is not None:\n #if id is not None:\n
# directory.manage_renameObject(id=dest.getId(),new_id=id)\n # directory.manage_renameObject(id=dest.getId(),new_id=id)\n
\n \n
context.log(\'WebSite_clone\', context.REQUEST.form)\n
\n
for (key, val) in context.REQUEST.form.items():\n for (key, val) in context.REQUEST.form.items():\n
if key != \'id\' and dest.hasProperty(key):\n if key != \'id\' and dest.hasProperty(key):\n
context.log(\'WebSite_clone\',\'overwriting attr "%s" to value "%s"\' % (key,val))\n
dest.setProperty(key, val)\n dest.setProperty(key, val)\n
\n \n
return context.REQUEST.RESPONSE.redirect(\'%s/%s\' % (directory.WebSite_getUrl(), dest.getId()))\n return context.REQUEST.RESPONSE.redirect(\'%s/%s\' % (directory.WebSite_getUrl(), dest.getId()))\n
......
...@@ -73,11 +73,11 @@ ...@@ -73,11 +73,11 @@
html_list = []\n html_list = []\n
\n \n
for crumb in context.WebSite_getBreadcrumbValue():\n for crumb in context.WebSite_getBreadcrumbValue():\n
if crumb.getTitle() is None or crumb.getTitle() == \'\':\n text = None\n
text = crumb.getId()\n for property in (\'title\', \'short_title\', \'id\'):\n
else:\n if text in (None, \'\') and hasattr(crumb, property):\n
text = crumb.getTitle()\n text = getattr(crumb, property)\n
html_list.append(\'<a href="%s">%s</a>\' % (crumb.WebSite_getUrl(), text))\n html_list.append(\'<a href="%s">%s</a>\' % (crumb.WebSite_getUrl(), text))\n
\n \n
return \' &gt; \'.join(html_list)\n return \' &gt; \'.join(html_list)\n
...@@ -129,6 +129,9 @@ return \' &gt; \'.join(html_list)\n ...@@ -129,6 +129,9 @@ return \' &gt; \'.join(html_list)\n
<string>crumb</string> <string>crumb</string>
<string>None</string> <string>None</string>
<string>text</string> <string>text</string>
<string>property</string>
<string>hasattr</string>
<string>getattr</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -93,7 +93,7 @@ return context.WebSite_getUrl()\n ...@@ -93,7 +93,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>
...@@ -119,6 +119,7 @@ return context.WebSite_getUrl()\n ...@@ -119,6 +119,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>
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,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>
...@@ -129,6 +129,7 @@ return url\n ...@@ -129,6 +129,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>
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>section = context.WebSite_getSectionValue()\n <value> <string>section = context.WebSite_getSectionValue()\n
if section is not None:\n if section is not None:\n
return section.getTitle()\n return section.WebSite_getUrl()\n
return None\n return None\n
</string> </value> </string> </value>
</item> </item>
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</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>
...@@ -109,10 +109,10 @@ ...@@ -109,10 +109,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