Skip to content

erp5
erp5
Commit e22ac3e2 authored by Mame Coumba Sall's avatar Mame Coumba Sall
Browse files
Options

2009-02-26 mame 

expiration_date added on Item_view and tracking list used instead of current tracking list

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25730 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6fb138d8
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 146 deletions
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item.xml
View file @ e22ac3e2
...@@ -9,24 +9,12 @@ ...@@ -9,24 +9,12 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_objects</string> </key> <key> <string>_objects</string> </key>
<value> <value>
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>erp5_item</string> </value> <value> <string>erp5_item</string> </value>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml
View file @ e22ac3e2
...@@ -9,22 +9,10 @@ ...@@ -9,22 +9,10 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
<value> <int>3</int> </value> <value> <int>3</int> </value>
</item> </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
<value> <value>
...@@ -68,7 +56,7 @@ ...@@ -68,7 +56,7 @@
<value> <string>from DateTime import DateTime\n <value> <string>from DateTime import DateTime\n
\n \n
date = DateTime()\n date = DateTime()\n
last_affectation = context.portal_simulation.getCurrentTrackingList(item=context.getRelativeUrl(), at_date=date)\n last_affectation = context.portal_simulation.getTrackingList(item=context.getRelativeUrl(), at_date=date)\n
\n \n
if len(last_affectation) == 0:\n if len(last_affectation) == 0:\n
return None\n return None\n
...@@ -84,12 +72,6 @@ return owner\n ...@@ -84,12 +72,6 @@ return owner\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>with_title = 1</string> </value> <value> <string>with_title = 1</string> </value>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteTitle.xml
View file @ e22ac3e2
...@@ -9,22 +9,10 @@ ...@@ -9,22 +9,10 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
<value> <int>3</int> </value> <value> <int>3</int> </value>
</item> </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
<value> <value>
...@@ -76,18 +64,6 @@ return None\n ...@@ -76,18 +64,6 @@ return None\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
View file @ e22ac3e2
...@@ -9,22 +9,10 @@ ...@@ -9,22 +9,10 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
<value> <int>3</int> </value> <value> <int>3</int> </value>
</item> </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
<value> <value>
...@@ -65,7 +53,8 @@ ...@@ -65,7 +53,8 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if context.Item_getResourceValue() is not None:\n <value> <string>context.log(context.Item_getResourceValue())\n
if context.Item_getResourceValue() is not None:\n
return context.Item_getResourceValue().getTitle()\n return context.Item_getResourceValue().getTitle()\n
return \'\'\n return \'\'\n
</string> </value> </string> </value>
...@@ -76,12 +65,6 @@ return \'\'\n ...@@ -76,12 +65,6 @@ return \'\'\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
View file @ e22ac3e2
...@@ -9,22 +9,10 @@ ...@@ -9,22 +9,10 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
<value> <int>3</int> </value> <value> <int>3</int> </value>
</item> </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
<value> <value>
...@@ -70,13 +58,15 @@ ...@@ -70,13 +58,15 @@
#kw[\'at_date\'] = DateTime()\n #kw[\'at_date\'] = DateTime()\n
kw[\'item\'] = context.getRelativeUrl()\n kw[\'item\'] = context.getRelativeUrl()\n
\n \n
last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n last_affectation_list = context.portal_simulation.getTrackingList(**kw)\n
\n
if kw.get(\'src__\',0):\n if kw.get(\'src__\',0):\n
return last_affectation_list\n return last_affectation_list\n
if len(last_affectation_list):\n if len(last_affectation_list):\n
last_affectation = last_affectation_list[0]\n last_affectation = last_affectation_list[0]\n
if last_affectation.resource_uid is not None:\n if last_affectation.resource_uid is not None:\n
resource_value = context.portal_catalog.getObject(last_affectation.resource_uid)\n resource_value = context.portal_catalog.getObject(last_affectation.resource_uid)\n
\n
return resource_value\n return resource_value\n
return None\n return None\n
</string> </value> </string> </value>
...@@ -87,18 +77,6 @@ return None\n ...@@ -87,18 +77,6 @@ return None\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>**kw</string> </value> <value> <string>**kw</string> </value>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
View file @ e22ac3e2
...@@ -9,22 +9,10 @@ ...@@ -9,22 +9,10 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>Script_magic</string> </key> <key> <string>Script_magic</string> </key>
<value> <int>3</int> </value> <value> <int>3</int> </value>
</item> </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
<value> <value>
...@@ -108,18 +96,6 @@ return history_list\n ...@@ -108,18 +96,6 @@ return history_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>current=1, *args, **kw</string> </value> <value> <string>current=1, *args, **kw</string> </value>
...@@ -192,12 +168,6 @@ return history_list\n ...@@ -192,12 +168,6 @@ return history_list\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Item_getTrackingList</string> </value> <value> <string>Item_getTrackingList</string> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
<value> <value>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml
View file @ e22ac3e2
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
<value> <value>
...@@ -100,6 +94,7 @@ ...@@ -100,6 +94,7 @@
<string>my_serial_number</string> <string>my_serial_number</string>
<string>my_current_owner</string> <string>my_current_owner</string>
<string>my_current_site</string> <string>my_current_site</string>
<string>my_expiration_date</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_expiration_date.xml 0 → 100644
View file @ e22ac3e2
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>timezone_style</string>
<string>input_order</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_expiration_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>input_order</string> </key>
<value> <string>dmy</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>timezone_style</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Expiration Date</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml
View file @ e22ac3e2
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<value> <string>Item_viewFieldLibrary</string> </value> <value> <string>Item_viewFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_serial_number.xml
View file @ e22ac3e2
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
View file @ e22ac3e2
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<string>Products.ERP5Form.ProxyField</string> <tuple/>
<string>ProxyField</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -15,7 +12,9 @@ ...@@ -15,7 +12,9 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>items</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -68,6 +67,16 @@ ...@@ -68,6 +67,16 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -89,10 +98,32 @@ ...@@ -89,10 +98,32 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Item_viewFieldLibrary</string> </value> <value> <string>Item_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_item/bt/revision
View file @ e22ac3e2
55 58
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7