[Erp5-report] r22311 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jul 7 15:24:20 CEST 2008
Author: nicolas
Date: Mon Jul 7 15:24:19 2008
New Revision: 22311
URL: http://svn.erp5.org?rev=22311&view=rev
Log:
Handle None values
Change listbox column ids
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml?rev=22311&r1=22310&r2=22311&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml Mon Jul 7 15:24:19 2008
@@ -67,7 +67,7 @@
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Document import newTempBase\n
catalog = context.portal_catalog.getResultValue\n
-if current == 1:\n
+if current:\n
method = context.portal_simulation.getCurrentTrackingList\n
else:\n
method = context.portal_simulation.getTrackingList\n
@@ -84,16 +84,18 @@
for res in method(aggregate_uid=uid, **kw):\n
history = newTempBase(context, str(len(history_list)))\n
explanation = catalog(uid=res.delivery_uid).getExplanationValue()\n
-\n
+ node_value = catalog(uid=res.node_uid)\n
+ section_value = catalog(uid=res.section_uid)\n
+ resource_value = catalog(uid=res.resource_uid)\n
history.edit(\n
#uid = catalog(uid=res.uid).getTitle(),\n
date=res.date,\n
- node_uid=catalog(uid=res.node_uid).getTitle(),\n
- section_uid=catalog(uid=res.section_uid).getTitle(),\n
- resource_uid=catalog(uid=res.resource_uid).getTitle(),\n
+ node_title=node_value is not None and node_value.getTitle() or None,\n
+ section_title=section_value is not None and section_value.getTitle() or None,\n
+ resource_title=resource_value is not None and resource_value.getTitle() or None,\n
explanation=explanation.getTitle(),\n
url=explanation.absolute_url(),\n
- simulation_state = explanation.getTranslatedSimulationState(),\n
+ simulation_state=explanation.getTranslatedSimulationState(),\n
)\n
history_list.append(history)\n
\n
@@ -120,7 +122,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>current=1,*args, **kw</string> </value>
+ <value> <string>current=1, *args, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -166,6 +168,10 @@
<string>len</string>
<string>history</string>
<string>explanation</string>
+ <string>node_value</string>
+ <string>section_value</string>
+ <string>resource_value</string>
+ <string>None</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml?rev=22311&r1=22310&r2=22311&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml Mon Jul 7 15:24:19 2008
@@ -82,7 +82,7 @@
<value>
<dictionary>
<item>
- <key> <string>columns</string> </key>
+ <key> <string>columns</string> </key>
<value>
<list>
<tuple>
@@ -94,15 +94,15 @@
<string>Date</string>
</tuple>
<tuple>
- <string>node_uid</string>
+ <string>node_title</string>
<string>Node</string>
</tuple>
<tuple>
- <string>section_uid</string>
+ <string>section_title</string>
<string>Section</string>
</tuple>
<tuple>
- <string>resource_uid</string>
+ <string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
@@ -113,7 +113,7 @@
</value>
</item>
<item>
- <key> <string>editable_columns</string> </key>
+ <key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
@@ -132,21 +132,21 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>list_action</string> </key>
+ <key> <string>list_action</string> </key>
<value> <string>Item_viewTrackingList</string> </value>
</item>
<item>
- <key> <string>list_method</string> </key>
+ <key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>selection_name</string> </key>
+ <key> <string>selection_name</string> </key>
<value> <string>item_tracking_selection</string> </value>
</item>
<item>
- <key> <string>sort</string> </key>
+ <key> <string>sort</string> </key>
<value>
<list>
<tuple>
@@ -161,11 +161,11 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Item Tracking</string> </value>
</item>
<item>
- <key> <string>url_columns</string> </key>
+ <key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=22311&r1=22310&r2=22311&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision Mon Jul 7 15:24:19 2008
@@ -1,1 +1,1 @@
-49
+50
More information about the Erp5-report
mailing list