[Erp5-report] r32130 luke - in /erp5/trunk/bt5/erp5_web: ToolTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: luke
Date: Mon Feb  1 12:46:08 2010
New Revision: 32130

URL: http://svn.erp5.org?rev=32130&view=rev
Log:
 - simplify code (thanks Kazuhiko)

Modified:
    erp5/trunk/bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml?rev=32130&r1=32129&r2=32130&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml [utf8] Mon Feb  1 12:46:08 2010
@@ -241,7 +241,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: getattr(object, \'getModificationDate\', None) is not None and object.getModificationDate() or object.modified()</string> </value>
+            <value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -289,7 +289,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: getattr(object, \'getModificationDate\', None) is not None and object.getModificationDate() or object.modified()</string> </value>
+            <value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -337,7 +337,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: getattr(object, \'getModificationDate\', None) is not None and object.getModificationDate() or object.modified()</string> </value>
+            <value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -353,7 +353,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: member is None and object.getPortalType() in object.getPortalWebDocumentTypeList()</string> </value>
+            <value> <string>python: member is None and object.getPortalType() in ("Web Page", "Web Section", "Web Site")</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=32130&r1=32129&r2=32130&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Mon Feb  1 12:46:08 2010
@@ -1,1 +1,1 @@
-903
+904