ERP5Workflow: remove some old guards kept by mistake

creating a guard when all the informations are already in properties
of the object is useless, these guards were forgotten

product/ERP5Workflow/Document/InteractionWorkflow.py

@@ -137,8 +137,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
         break
     if vdef is _MARKER:
       return default
-    if vdef.getInfoGuard() is not None and not vdef.getInfoGuard().check(
-      getSecurityManager(), self, ob):
+    if not vdef.checkGuard(getSecurityManager(), self, ob):
       return default
     status = self._getStatusOf(ob)
     variable_expression = vdef.getVariableExpression()

product/ERP5Workflow/Document/Workflow.py

@@ -470,8 +470,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
       if name == self.getStateVariable():
           return self._getWorkflowStateOf(ob, 1)
       vdef = self.getVariableValueDict()[name]
-      if vdef.getInfoGuard() is not None and not vdef.getInfoGuard().check(
-          getSecurityManager(), self, ob):
+      if not vdef.checkGuard(getSecurityManager(), self, ob):
           return default
       status = self.getCurrentStatusDict(ob)
       variable_expression = vdef.getVariableExpression()

product/ERP5Workflow/Document/WorkflowVariable.py

@@ -28,12 +28,13 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.Expression import Expression
-from Products.DCWorkflow.Guard import Guard
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.id_as_reference import IdAsReferenceMixin
 from Products.ERP5Type.XMLObject import XMLObject
+from Products.ERP5Workflow.mixin.guardable import GuardableMixin
 
-class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject):
+class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject,
+                       GuardableMixin):
     """
     A ERP5 Workflow Variable.
     """
@@ -73,25 +74,3 @@ class WorkflowVariable(IdAsReferenceMixin("variable_", "prefix"), XMLObject):
 
     def getVariableExpressionText(self):
       return getattr(self.variable_expression, 'text', '')
-
-    def getInfoGuard(self):
-      if self.getGuardRoleList() is None and\
-          self.getGuardPermissionList() is None and\
-          self.getGuardGroupList() is None and\
-          self.getGuardExpression() is None and\
-          self.info_guard is None:
-        return Guard().__of__(self)
-      elif self.info_guard is None:
-        self.generateInfoGuard()
-      return self.info_guard
-
-    def generateInfoGuard(self):
-      self.info_guard = Guard()
-      if self.getGuardRoleList() is not None:
-        self.info_guard.roles = self.getGuardRoleList()
-      if self.getGuardPermissionList() is not None:
-        self.info_guard.permissions = self.getGuardPermissionList()
-      if self.getGuardGroupList() is not None:
-        self.info_guard.groups = self.getGuardGroupList()
-      if self.getGuardExpression() is not None:
-        self.info_guard.expr = Expression(self.getGuardExpression())

product/ERP5Workflow/Document/WorklistVariable.py

@@ -47,4 +47,5 @@ class WorklistVariable(WorkflowVariable):
                PropertySheet.DublinCore,
                PropertySheet.Reference,
                PropertySheet.Variable,
+               PropertySheet.Guard,
     )