Changeset 1774

Timestamp:

15.12.2011 22:16:10 (5 months ago)

Author:

zmsdev

Message:

applied minor performance-fixes (6)

Location:

ZMS/trunk

Files:

• ZMSGlobals.py (modified) (1 diff)
• _versionmanager.py (modified) (1 diff)

ZMS/trunk/ZMSGlobals.py

@@ -1576 +1576 @@
       return _globals.compareDate(t0, t1) 
 
+    # -------------------------------------------------------------------------- 
+    #  ZMSGlobals.daysBetween: 
+    # -------------------------------------------------------------------------- 
+    def daysBetween(self, t0, t1):
+      return _globals.daysBetween(t0, t1) 
+
 
 # call this to initialize framework classes, which

ZMS/trunk/_versionmanager.py

@@ -1094 +1094 @@
     def isVersionContainer(self):
       b = False
-      b = b or (self.isPage() and self.isPageContainer())
-      b = b or (self.isPage() and self.meta_id == 'ZMSLinkElement' and self.isEmbedded(self.REQUEST))
-      if not b:
-        parent = self.getParentNode()
-        b = parent is not None and parent.isPageContainer() and self.isPage()
+      if self.isPage():
+        b = self.isPageContainer()
+        if not b:
+          b = self.meta_id == 'ZMSLinkElement' and self.isEmbedded(self.REQUEST)
+        if not b:
+          parent = self.getParentNode()
+          b = parent is not None and parent.isPageContainer()
       return b