[Erp5-report] r20152 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Mar 26 15:43:25 CET 2008
Author: jerome
Date: Wed Mar 26 15:43:21 2008
New Revision: 20152
URL: http://svn.erp5.org?rev=20152&view=rev
Log:
Optimisation to set delivery_mirror_section_url on the brain was not working on virtual hosting environment
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyUrl.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=20152&r1=20151&r2=20152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Wed Mar 26 15:43:21 2008
@@ -358,6 +358,12 @@
</dictionary>
</state>
</object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
</value>
</item>
<item>
@@ -636,11 +642,6 @@
SELECT COUNT(DISTINCT uid) AS count FROM (\n
<dtml-else>\n
SELECT main.*,\n
- <dtml-let portal="portal_url.getPortalObject()"\n
- substring_position="len(\'/\'.join(portal.getPhysicalPath()))+1"\n
- portal_absolute_url="portal.absolute_url(relative=1)">\n
- ( SELECT CONCAT(<dtml-sqlvar portal_absolute_url type=string>, SUBSTRING(path, <dtml-var substring_position>)) FROM catalog as mirror_catalog WHERE mirror_catalog.uid=main.delivery_mirror_section_uid ) AS delivery_mirror_section_url,\n
- </dtml-let>\n
( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=main.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n
( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = main.uid AND stock.section_uid=main.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n
( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = main.uid AND stock.section_uid=main.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n
@@ -1300,11 +1301,6 @@
SELECT COUNT(DISTINCT uid) AS count FROM (\n
<dtml-else>\n
SELECT main.*,\n
- <dtml-let portal="portal_url.getPortalObject()"\n
- substring_position="len(\'/\'.join(portal.getPhysicalPath()))+1"\n
- portal_absolute_url="portal.absolute_url(relative=1)">\n
- ( SELECT CONCAT(<dtml-sqlvar portal_absolute_url type=string>, SUBSTRING(path, <dtml-var substring_position>)) FROM catalog as mirror_catalog WHERE mirror_catalog.uid=main.delivery_mirror_section_uid ) AS delivery_mirror_section_url,\n
- </dtml-let>\n
( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=main.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n
( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = main.uid AND stock.section_uid=main.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n
( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = main.uid AND stock.section_uid=main.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyUrl.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyUrl.xml?rev=20152&r1=20151&r2=20152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyUrl.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyUrl.xml Wed Mar 26 15:43:21 2008
@@ -68,11 +68,6 @@
<value> <string># XXX bad name: AccountingTransaction_getMirrorSectionUrl sounds more consistent\n
view_name = \'Entity_viewAccountingTransactionList?reset:int=1\'\n
\n
-try:\n
- return \'/%s/%s\' % (context.delivery_mirror_section_url, view_name)\n
-except AttributeError:\n
- pass\n
-\n
if brain is not None:\n
transaction = brain.getObject()\n
else:\n
@@ -132,11 +127,10 @@
<string>selection_name</string>
<string>kwd</string>
<string>view_name</string>
+ <string>None</string>
<string>_getattr_</string>
+ <string>transaction</string>
<string>context</string>
- <string>AttributeError</string>
- <string>None</string>
- <string>transaction</string>
<string>mirror_section</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=20152&r1=20151&r2=20152&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Mar 26 15:43:21 2008
@@ -1,1 +1,1 @@
-657
+658
More information about the Erp5-report
mailing list