[Erp5-report] r20960 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed May 14 14:30:53 CEST 2008
Author: jerome
Date: Wed May 14 14:30:52 2008
New Revision: 20960
URL: http://svn.erp5.org?rev=20960&view=rev
Log:
2008-05-14 jerome
* Use absolute_url when necessary to produce URLs compatible with virtual hosting.
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToBankAccount.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml
erp5/trunk/bt5/erp5_accounting/bt/change_log
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference.xml?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference.xml Wed May 14 14:30:52 2008
@@ -67,7 +67,7 @@
<key> <string>_body</string> </key>
<value> <string>request = context.REQUEST\n
return request.RESPONSE.redirect( "%s/Preference_viewAccounting" %\n
- context.portal_preferences.getActivePreference().getPath())\n
+ context.portal_preferences.getActivePreference().absolute_url())\n
\n
# vim: syntax=python\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToBankAccount.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToBankAccount.xml?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToBankAccount.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToBankAccount.xml Wed May 14 14:30:52 2008
@@ -66,27 +66,26 @@
<item>
<key> <string>_body</string> </key>
<value> <string># Jump to a bank account of the current organisation\n
-\n
+N_ = context.Base_translateString\n
request=context.REQUEST\n
-organisation = context.restrictedTraverse(\n
- context.getPortalObject().portal_preferences.\\\n
- getPreferredAccountingTransactionSourceSection())\n
+portal = context.getPortalObject()\n
+organisation = portal.restrictedTraverse(\n
+ portal.portal_preferences.getPreferredAccountingTransactionSourceSection())\n
\n
if organisation is not None :\n
selection_uid_list = [ bank_account.getUid() for bank_account \\\n
- in organisation.searchFolder(portal_type = [\'Bank Account\', \'Cash Register\', \'Credit Card\']) ]\n
+ in organisation.searchFolder(portal_type=portal.getPortalPaymentNodeTypeList()) ]\n
if len(selection_uid_list) != 0 : \n
kw = {\'uid\': selection_uid_list}\n
- context.portal_selections.setSelectionParamsFor(\'Base_jumpToRelatedObjectList\', kw)\n
+ portal.portal_selections.setSelectionParamsFor(\'Base_jumpToRelatedObjectList\', kw)\n
request.set(\'object_uid\', context.getUid())\n
request.set(\'uids\', selection_uid_list)\n
return context.Base_jumpToRelatedObjectList(\n
uids=selection_uid_list, REQUEST=request)\n
\n
-redirect_url = \'%s/view?%s\' % (context.getPath(),\n
- \'portal_status_message=No+Bank+Account+For+Current+Organisation\')\n
-return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
-# vim: syntax=python\n
+return context.Base_redirect(form_id,\n
+ keep_items=dict(portal_status_message=\n
+ N_(\'No Bank Account For Current Organisation\')))\n
</string> </value>
</item>
<item>
@@ -103,7 +102,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string></string> </value>
+ <value> <string>form_id=\'view\'</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -123,15 +122,18 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>form_id</string>
<string>_getattr_</string>
<string>context</string>
+ <string>N_</string>
<string>request</string>
+ <string>portal</string>
<string>organisation</string>
<string>None</string>
<string>append</string>
@@ -141,8 +143,7 @@
<string>selection_uid_list</string>
<string>len</string>
<string>kw</string>
- <string>redirect_url</string>
- <string>_getitem_</string>
+ <string>dict</string>
</tuple>
</value>
</item>
@@ -154,7 +155,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <string>view</string>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml Wed May 14 14:30:52 2008
@@ -138,7 +138,7 @@
new_line.setProperty(prop, line.getProperty(prop))\n
\n
return context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" %\n
- (reversal.getPath(),\n
+ (reversal.absolute_url(),\n
N_("Reversal Transaction for ${specific_reference} created.",\n
mapping={\'specific_reference\': specific_reference})))\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml Wed May 14 14:30:52 2008
@@ -92,7 +92,7 @@
\n
if redirect:\n
context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
- transaction.getPath(), N_(\'Empty+Lines+Deleted.\')))\n
+ transaction.absolute_url(), N_(\'Empty+Lines+Deleted.\')))\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_accounting/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/change_log?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/change_log Wed May 14 14:30:52 2008
@@ -1,3 +1,6 @@
+2008-05-14 jerome
+* Use absolute_url when necessary to produce URLs compatible with virtual hosting.
+
2008-04-19 yo
* Bump to 5.0.
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed May 14 14:30:52 2008
@@ -1,1 +1,1 @@
-695
+697
More information about the Erp5-report
mailing list