[Erp5-report] r7702 - in /erp5/trunk/bt5/erp5_web: CatalogMethodTemplateItem/portal_catalog...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 12 16:37:20 CEST 2006
Author: kevin
Date: Mon Jun 12 16:37:17 2006
New Revision: 7702
URL: http://svn.erp5.org?rev=7702&view=rev
Log:
Revert changes (mistake: I was reading the diff in the wrong order...)
Modified:
erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml
erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml
erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_clone.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getListboxUrl.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSearchResult.xml
Modified: erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml (original)
+++ erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml Mon Jun 12 16:37:17 2006
@@ -81,7 +81,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
+ <value> <string>erp5_sql_deferred_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
Modified: erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml (original)
+++ erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml Mon Jun 12 16:37:17 2006
@@ -45,7 +45,7 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>uid</string>
+<string>uid</string>
</list>
</value>
</item>
@@ -90,7 +90,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
+ <value> <string>erp5_sql_deferred_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
Modified: erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml (original)
+++ erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml Mon Jun 12 16:37:17 2006
@@ -51,8 +51,8 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>uid</string>
- <string>SearchableText</string>
+<string>uid</string>
+<string>SearchableText</string>
</list>
</value>
</item>
@@ -98,7 +98,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
+ <value> <string>erp5_sql_deferred_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
Modified: erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml (original)
+++ erp5/trunk/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml Mon Jun 12 16:37:17 2006
@@ -87,7 +87,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
+ <value> <string>erp5_sql_deferred_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_clone.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_clone.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_clone.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_clone.xml Mon Jun 12 16:37:17 2006
@@ -79,11 +79,8 @@
#if id is not None:\n
# directory.manage_renameObject(id=dest.getId(),new_id=id)\n
\n
-context.log(\'WebSite_clone\', context.REQUEST.form)\n
-\n
for (key, val) in context.REQUEST.form.items():\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
\n
return context.REQUEST.RESPONSE.redirect(\'%s/%s\' % (directory.WebSite_getUrl(), dest.getId()))\n
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml Mon Jun 12 16:37:17 2006
@@ -73,11 +73,11 @@
html_list = []\n
\n
for crumb in context.WebSite_getBreadcrumbValue():\n
- if crumb.getTitle() is None or crumb.getTitle() == \'\':\n
- text = crumb.getId()\n
- else:\n
- text = crumb.getTitle()\n
- html_list.append(\'<a href="%s">%s</a>\' % (crumb.WebSite_getUrl(), text))\n
+ text = None\n
+ for property in (\'title\', \'short_title\', \'id\'):\n
+ if text in (None, \'\') and hasattr(crumb, property):\n
+ text = getattr(crumb, property)\n
+ html_list.append(\'<a href="%s">%s</a>\' % (crumb.WebSite_getUrl(), text))\n
\n
return \' > \'.join(html_list)\n
@@ -129,6 +129,9 @@
<string>crumb</string>
<string>None</string>
<string>text</string>
+ <string>property</string>
+ <string>hasattr</string>
+ <string>getattr</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml Mon Jun 12 16:37:17 2006
@@ -93,7 +93,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string></string> </value>
+ <value> <string>**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -119,6 +119,7 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>document</string>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getListboxUrl.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getListboxUrl.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getListboxUrl.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getListboxUrl.xml Mon Jun 12 16:37:17 2006
@@ -72,7 +72,7 @@
if brain is not None:\n
o = brain.getObject()\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
return url\n
</string> </value>
@@ -129,6 +129,7 @@
<string>o</string>
<string>_getitem_</string>
<string>context</string>
+ <string>getattr</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml Mon Jun 12 16:37:17 2006
@@ -70,7 +70,7 @@
<key> <string>_body</string> </key>
<value> <string>section = context.WebSite_getSectionValue()\n
if section is not None:\n
- return section.getTitle()\n
+ return section.WebSite_getUrl()\n
return None\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSearchResult.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSearchResult.xml?rev=7702&r1=7701&r2=7702&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSearchResult.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSearchResult.xml Mon Jun 12 16:37:17 2006
@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string></string> </value>
+ <value> <string>**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -109,10 +109,10 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>kw</string>
<string>_apply_</string>
<string>_getattr_</string>
-<string>context</string>
- <string>kw</string>
+ <string>context</string>
</tuple>
</value>
</item>
More information about the Erp5-report
mailing list