[Erp5-report] r19535 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 26 19:36:04 CET 2008
Author: yusei
Date: Tue Feb 26 19:36:04 2008
New Revision: 19535
URL: http://svn.erp5.org?rev=19535&view=rev
Log:
Optimize listbox when delivery_mirror_section_title is entered.
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_getThirdPartyTitle.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=19535&r1=19534&r2=19535&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 Tue Feb 26 19:36:04 2008
@@ -672,7 +672,10 @@
</dtml-if>\n
</dtml-let>\n
</dtml-if>\n
- <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
+ <dtml-if delivery_mirror_section_title>\n
+ , mirror_section_catalog.title as delivery_mirror_section_title\n
+ , mirror_section_catalog.path as delivery_mirror_section_path\n
+ </dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -861,7 +864,10 @@
</dtml-if>\n
</dtml-let>\n
</dtml-if>\n
- <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
+ <dtml-if delivery_mirror_section_title>\n
+ , mirror_section_catalog.title as delivery_mirror_section_title\n
+ , mirror_section_catalog.path as delivery_mirror_section_path\n
+ </dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -1327,7 +1333,10 @@
</dtml-if>\n
</dtml-let>\n
</dtml-if>\n
- <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
+ <dtml-if delivery_mirror_section_title>\n
+ , mirror_section_catalog.title as delivery_mirror_section_title\n
+ , mirror_section_catalog.path as delivery_mirror_section_path\n
+ </dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -1516,7 +1525,10 @@
</dtml-if>\n
</dtml-let>\n
</dtml-if>\n
- <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
+ <dtml-if delivery_mirror_section_title>\n
+ , mirror_section_catalog.title as delivery_mirror_section_title\n
+ , mirror_section_catalog.path as delivery_mirror_section_path\n
+ </dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml?rev=19535&r1=19534&r2=19535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml Tue Feb 26 19:36:04 2008
@@ -66,14 +66,30 @@
<item>
<key> <string>_body</string> </key>
<value> <string># XXX bad name: AccountingTransaction_getMirrorSectionTitle sounds more consistent\n
+\n
+try:\n
+ return context.delivery_mirror_section_title\n
+except AttributeError:\n
+ pass\n
+\n
if brain is not None:\n
transaction = brain.getObject()\n
else:\n
transaction = context\n
\n
-if transaction.AccountingTransaction_isSourceView():\n
- return transaction.getDestinationSectionTitle()\n
-return transaction.getSourceSectionTitle()\n
+mirror_section_key = \'mirror_section_value_%s\' % transaction.getId()\n
+\n
+try:\n
+ mirror_section = context.REQUEST[mirror_section_key]\n
+except KeyError:\n
+ if transaction.AccountingTransaction_isSourceView():\n
+ mirror_section = transaction.getDestinationSectionValue()\n
+ else:\n
+ mirror_section = transaction.getSourceSectionValue()\n
+ context.REQUEST.set(mirror_section_key, mirror_section)\n
+\n
+if mirror_section is not None:\n
+ return mirror_section.getTitle()\n
</string> </value>
</item>
<item>
@@ -120,10 +136,15 @@
<string>selection</string>
<string>selection_name</string>
<string>kw</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>AttributeError</string>
<string>None</string>
- <string>_getattr_</string>
<string>transaction</string>
- <string>context</string>
+ <string>mirror_section_key</string>
+ <string>_getitem_</string>
+ <string>mirror_section</string>
+ <string>KeyError</string>
</tuple>
</value>
</item>
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=19535&r1=19534&r2=19535&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 Tue Feb 26 19:36:04 2008
@@ -65,22 +65,32 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># XXX bad name: AccountingTransaction_getMirrorSection sounds more consistent\n
-section_category=context.portal_selections.getSelectionParamsFor(selection_name).get(\'section_category\')\n
-if not section_category:\n
- return\n
+ <value> <string># XXX bad name: AccountingTransaction_getMirrorSectionUrl sounds more consistent\n
+url_template = \'%s/Entity_viewAccountingTransactionList?reset:int=1\'\n
\n
-transaction = brain.getObject()\n
-source_section = transaction.getSourceSectionValue()\n
+try:\n
+ return url_template % context.getPortalObject().restrictedTraverse(context.delivery_mirror_section_path).absolute_url()\n
+except AttributeError:\n
+ pass\n
\n
-if source_section is not None and source_section.isMemberOf(section_category):\n
- mirror_section = transaction.getDestinationSectionValue()\n
+if brain is not None:\n
+ transaction = brain.getObject()\n
else:\n
- mirror_section = transaction.getSourceSectionValue()\n
+ transaction = context\n
+\n
+mirror_section_key = \'mirror_section_value_%s\' % transaction.getId()\n
+\n
+try:\n
+ mirror_section = context.REQUEST[mirror_section_key]\n
+except KeyError:\n
+ if transaction.AccountingTransaction_isSourceView():\n
+ mirror_section = transaction.getDestinationSectionValue()\n
+ else:\n
+ mirror_section = transaction.getSourceSectionValue()\n
+ context.REQUEST.set(mirror_section_key, mirror_section)\n
\n
if mirror_section is not None:\n
- return "%s/Entity_viewAccountingTransactionList?reset:int=1" %\\\n
- mirror_section.absolute_url()\n
+ return url_template % mirror_section.absolute_url()\n
</string> </value>
</item>
<item>
@@ -127,13 +137,16 @@
<string>selection</string>
<string>selection_name</string>
<string>kwd</string>
+ <string>url_template</string>
<string>_getattr_</string>
<string>context</string>
- <string>section_category</string>
+ <string>AttributeError</string>
+ <string>None</string>
<string>transaction</string>
- <string>source_section</string>
- <string>None</string>
+ <string>mirror_section_key</string>
+ <string>_getitem_</string>
<string>mirror_section</string>
+ <string>KeyError</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=19535&r1=19534&r2=19535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Feb 26 19:36:04 2008
@@ -1,1 +1,1 @@
-617
+619
More information about the Erp5-report
mailing list