Worklist.py: getGuard allow to return none if necessary.

product/ERP5Workflow/Document/Worklist.py

@@ -77,29 +77,34 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
                PropertySheet.Worklist,
     )
 
-    def getGuard(self):
-        if self.guard is None:
-          self.generateGuard()
-        return self.guard
-
     def getGuardSummary(self):
-        res = None
-        if self.guard is not None:
-            res = self.guard.getSummary()
-        return res
+      res = None
+      if self.getGuard() is not None:
+        res = self.guard.getSummary()
+      return res
+
+    def getGuard(self):
+      if self.getRoleList() is None and\
+          self.getPermissionList() is None and\
+          self.getGroupList() is None and\
+          self.getExpression() is None and\
+          self.guard is None:
+        return None
+      else:
+        self.generateGuard()
+      return self.guard
 
     def generateGuard(self):
-        if self.guard == None:
-          self.guard = Guard()
-
-        if self.getRoleList() is not None:
-          self.guard.roles = self.getRoleList()
-        if self.getPermissionList() is not None:
-          self.guard.permissions = self.getPermissionList()
-        if self.getGroupList() is not None:
-          self.guard.groups = self.getGroupList()
-        if self.getExpression() is not None:
-          self.guard.expr = Expression(self.getExpression())
+      if self.guard is None:
+        self.guard = Guard().__of__(self)
+      if self.getRoleList() is not None:
+        self.guard.roles = self.getRoleList()
+      if self.getPermissionList() is not None:
+        self.guard.permissions = self.getPermissionList()
+      if self.getGroupList() is not None:
+        self.guard.groups = self.getGroupList()
+      if self.getExpression() is not None:
+        self.guard.expr = Expression(self.getExpression())
 
     def getAvailableCatalogVars(self):
         res = []