[Erp5-report] r24760 - in /erp5/trunk/bt5/erp5_trade: ActionTemplateItem/portal_types/Organ...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Dec 2 11:25:40 CET 2008
Author: jerome
Date: Tue Dec 2 11:25:34 2008
New Revision: 24760
URL: http://svn.erp5.org?rev=24760&view=rev
Log:
Fix jump action by using Base_jumpToRelatedObject to jump and Base_checkPermission to check that the destination module is visible
Modified:
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -73,7 +73,7 @@
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-string:${portal_url}/purchase_order_module/view?reset:int=1&default_source_title=${object/getTitle}
+string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=Purchase+Order
]]></string> </value>
</item>
@@ -91,7 +91,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:portal.restrictedTraverse(\'purchase_order_module\', None) is not None</string> </value>
+ <value> <string>python: portal.Base_checkPermission(\'purchase_order_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -11,9 +11,7 @@
<dictionary>
<item>
<key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>category</string> </key>
@@ -22,12 +20,16 @@
<item>
<key> <string>condition</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=Purchase+Packing+List
+
+]]></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
@@ -71,27 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-string:${portal_url}/purchase_packing_list_module/view?reset:int=1&default_source_title=${object/getTitle}
-
-]]></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>python:portal.restrictedTraverse(\'purchase_packing_list_module\', None) is not None</string> </value>
+ <value> <string>python: portal.Base_checkPermission(\'purchase_packing_list_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -73,7 +73,7 @@
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-string:${portal_url}/sale_order_module/view?reset:int=1&default_destination_title=${object/getTitle}
+string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_type=Sale+Order
]]></string> </value>
</item>
@@ -91,7 +91,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:portal.restrictedTraverse(\'sale_order_module\', None) is not None</string> </value>
+ <value> <string>python: portal.Base_checkPermission(\'sale_order_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -73,7 +73,7 @@
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-string:${portal_url}/sale_packing_list_module/view?reset:int=1&default_destination_title=${object/getTitle}
+string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_type=Sale+Packing+List
]]></string> </value>
</item>
@@ -91,7 +91,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:portal.restrictedTraverse(\'sale_packing_list_module\', None) is not None</string> </value>
+ <value> <string>python: portal.Base_checkPermission(\'sale_packing_list_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -21,7 +21,9 @@
</item>
<item>
<key> <string>condition</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -69,7 +71,27 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${portal_url}/purchase_order_module/view</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=Purchase+Order
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: portal.Base_checkPermission(\'purchase_order_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -21,7 +21,9 @@
</item>
<item>
<key> <string>condition</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -69,7 +71,27 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${portal_url}/purchase_packing_list_module/view</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=Purchase+Packing+List
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: portal.Base_checkPermission(\'purchase_packing_list_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -21,7 +21,9 @@
</item>
<item>
<key> <string>condition</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -69,7 +71,27 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${portal_url}/sale_order_module/view</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_type=Sale+Order
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: portal.Base_checkPermission(\'sale_order_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml [utf8] Tue Dec 2 11:25:34 2008
@@ -21,7 +21,9 @@
</item>
<item>
<key> <string>condition</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -69,7 +71,27 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${portal_url}/sale_packing_list_module/view</string> </value>
+ <value> <string encoding="cdata"><![CDATA[
+
+string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_type=Sale+Packing+List
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: portal.Base_checkPermission(\'sale_packing_list_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=24760&r1=24759&r2=24760&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Tue Dec 2 11:25:34 2008
@@ -1,1 +1,1 @@
-534
+535
More information about the Erp5-report
mailing list