[Erp5-report] r36013 jerome - in /erp5/trunk/bt5/erp5_dummy_movement: DocumentTemplateItem/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 7 11:31:21 CEST 2010
Author: jerome
Date: Mon Jun 7 11:31:17 2010
New Revision: 36013
URL: http://svn.erp5.org?rev=36013&view=rev
Log:
* make dummy delivery member of delivery group
* make getExplanationValue and getDeliveryValue work as expected
* update bt export format
Added:
erp5/trunk/bt5/erp5_dummy_movement/bt/template_registered_skin_selection_list
Removed:
erp5/trunk/bt5/erp5_dummy_movement/bt/short_title
Modified:
erp5/trunk/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py
erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Delivery.xml
erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Movement.xml
erp5/trunk/bt5/erp5_dummy_movement/bt/revision
Modified: erp5/trunk/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py?rev=36013&r1=36012&r2=36013&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py [utf8] Mon Jun 7 11:31:17 2010
@@ -41,9 +41,6 @@
# Declarative security
security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- # Declarative interfaces
- __implements__ = ( interfaces.IVariated, )
# Declarative properties
property_sheets = ( PropertySheet.Base
@@ -89,9 +86,17 @@
raise ValueError
def getDeliveryValue(self):
- """A dummy movement doesn't have a delivery relation, so return self as delivery.
+ """In the tests, dummy movements are not always stored in a delivery, here
+ we try to support both cases.
"""
+ parent = self.getParentValue()
+ if hasattr(parent, 'getDeliveryValue'):
+ # we are in a delivery, make getDeliveryValue and therefore
+ # getExplanation value work like on real movements.
+ return parent.getDeliveryValue()
+ # return self, to have minimum support of getDeliveryValue
return self
+
def hasCellContent(self):
return False
Modified: erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%2520Delivery.xml?rev=36013&r1=36012&r2=36013&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Delivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Delivery.xml [utf8] Mon Jun 7 11:31:17 2010
@@ -10,38 +10,8 @@
<pickle>
<dictionary>
<item>
- <key> <string>_actions</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>_aliases</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_roles</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>allowed_content_types</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>base_category_list</string> </key>
- <value>
- <tuple/>
- </value>
</item>
<item>
<key> <string>content_icon</string> </key>
@@ -66,13 +36,9 @@
<item>
<key> <string>group_list</string> </key>
<value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>hidden_content_type_list</string> </key>
- <value>
- <tuple/>
+ <tuple>
+ <string>delivery</string>
+ </tuple>
</value>
</item>
<item>
@@ -81,16 +47,14 @@
</item>
<item>
<key> <string>init_script</string> </key>
- <value> <string></string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>property_sheet_list</string> </key>
<value>
- <tuple/>
+ <none/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Movement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%2520Movement.xml?rev=36013&r1=36012&r2=36013&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Movement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dummy_movement/PortalTypeTemplateItem/portal_types/Dummy%20Movement.xml [utf8] Mon Jun 7 11:31:17 2010
@@ -10,38 +10,8 @@
<pickle>
<dictionary>
<item>
- <key> <string>_actions</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>_aliases</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_roles</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>allowed_content_types</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>base_category_list</string> </key>
- <value>
- <tuple/>
- </value>
</item>
<item>
<key> <string>content_icon</string> </key>
@@ -73,12 +43,6 @@
</value>
</item>
<item>
- <key> <string>hidden_content_type_list</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
<key> <string>id</string> </key>
<value> <string>Dummy Movement</string> </value>
</item>
@@ -91,12 +55,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>property_sheet_list</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dummy_movement/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dummy_movement/bt/revision?rev=36013&r1=36012&r2=36013&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dummy_movement/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dummy_movement/bt/revision [utf8] Mon Jun 7 11:31:17 2010
@@ -1,1 +1,1 @@
-10
+14
Removed: erp5/trunk/bt5/erp5_dummy_movement/bt/short_title
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dummy_movement/bt/short_title?rev=36012&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dummy_movement/bt/short_title [utf8] (original)
+++ erp5/trunk/bt5/erp5_dummy_movement/bt/short_title (removed)
@@ -1,1 +1,0 @@
-None
Added: erp5/trunk/bt5/erp5_dummy_movement/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dummy_movement/bt/template_registered_skin_selection_list?rev=36013&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list