misc: replace get_role_translation() with a get_function_roles() method (#.....)

It removes the unobvious "_translation()" that has nothing to do with
languages and returns a set() instead of a single role identifier; this
may allow multiple roles filling a single function, at a later stage.

wcs/backoffice/management.py

@@ -3304,18 +3304,20 @@ class FormBackOfficeStatusPage(FormStatusPage):
             r += htmltext('<ul class="form-inspector biglist">')
             for key, label in (workflow.roles or {}).items():
                 r += htmltext('<li><span class="label">%s</span>') % label
-                acting_role_id = self.filled.get_role_translation(key)
+                r += htmltext('<div class="value">')
-                if acting_role_id:
+                acting_role_ids = self.filled.get_function_roles(key)
+                for acting_role_id in acting_role_ids:
                     try:
                         acting_role = get_publisher().role_class.get(acting_role_id)
-                        r += htmltext('<div class="value"><span>%s</span></div>') % acting_role.name
+                        r += htmltext('<span>%s</span> ') % acting_role.name
                     except KeyError:
-                        r += htmltext('<div class="value"><span>%s %s</span></div>') % (
+                        r += htmltext('<span>%s %s</span> ') % (
                             acting_role_id,
                             _('(deleted)'),
                         )
-                else:
+                if not acting_role_ids:
-                    r += htmltext('<div class="value"><span class="unset">%s</span></div>') % _('unset')
+                    r += htmltext('<span class="unset">%s</span>') % _('unset')
+                r += htmltext('</div>')
                 r += htmltext('</li>\n')
             r += htmltext('</ul>')
             r += htmltext('</div>')

wcs/formdata.py

@@ -672,7 +672,8 @@ class FormData(StorableObject):
     def get_display_id(self):
         return str(self.id_display or self.id)
 
-    def get_role_translation(self, role_name):
+    def get_function_roles(self, role_name):
+        # get a function name or role identifier and return a set of role identifiers
         if role_name == '_submitter':
             raise Exception('_submitter is not a valid role')
         if str(role_name).startswith('_'):
@@ -682,14 +683,15 @@ class FormData(StorableObject):
             if not role_id and self.formdef.workflow_roles:
                 role_id = self.formdef.workflow_roles.get(role_name)
             if role_id is None:
-                return role_id
+                return set()
-            return str(role_id)
+            return set([str(role_id)])
-        return str(role_name)
+        return set([str(role_name)])
 
     def get_handling_role_id(self):
         # TODO: look at current status and return the role(s) actually
         # concerned by the handling of the formdata
-        return self.get_role_translation('_receiver')
+        for role_id in self.get_function_roles('_receiver'):
+            return role_id
 
     def get_handling_role(self):
         try:
@@ -989,8 +991,7 @@ class FormData(StorableObject):
                 if self.is_submitter(user):
                     return True
             elif user:
-                role = self.get_role_translation(role)
+                if self.get_function_roles(role).intersection(user.get_roles()):
-                if role in user.get_roles():
                     return True
         return False
 
@@ -1010,8 +1011,7 @@ class FormData(StorableObject):
         # the very end (where it may be that there is no workflow status item
         # at all).
         for function_key in self.formdef.workflow.roles.keys():
-            handling_role = self.get_role_translation(function_key)
+            for handling_role in self.get_function_roles(function_key):
-            if handling_role:
                 status_action_roles.add(handling_role)
 
         wf_status = self.get_status()
@@ -1042,8 +1042,7 @@ class FormData(StorableObject):
                 if role == '_submitter':
                     status_action_roles.add(role)
                 else:
-                    real_role = self.get_role_translation(role)
+                    for real_role in self.get_function_roles(role):
-                    if real_role:
                         status_action_roles.add(real_role)
 
         return status_action_roles

wcs/forms/workflows.py

@@ -49,7 +49,7 @@ class HookDirectory(Directory):
                     break
                 if not user:
                     continue
-                if self.formdata.get_role_translation(role) in user.get_roles():
+                if self.formdata.get_function_roles(role).intersection(user.get_roles()):
                     break
             else:
                 raise errors.AccessForbiddenError('insufficient roles')

wcs/wf/aggregation_email.py

@@ -63,16 +63,16 @@ class AggregationEmailWorkflowStatusItem(WorkflowStatusItem):
             return
 
         for dest in self.to:
-            dest = formdata.get_role_translation(dest)
+            for dest_id in formdata.get_function_roles(dest):
-            try:
+                try:
-                aggregate = AggregationEmail.get(dest)
+                    aggregate = AggregationEmail.get(dest_id)
-            except KeyError:
+                except KeyError:
-                aggregate = AggregationEmail(id=dest)
+                    aggregate = AggregationEmail(id=dest_id)
 
-            aggregate.append(
+                aggregate.append(
-                {'formdef': formdata.formdef.id, 'formdata': formdata.id, 'formurl': formdata.get_url()}
+                    {'formdef': formdata.formdef.id, 'formdata': formdata.id, 'formurl': formdata.get_url()}
-            )
+                )
-            aggregate.store()
+                aggregate.store()
 
 
 register_item_class(AggregationEmailWorkflowStatusItem)

wcs/wf/notification.py

@@ -152,12 +152,12 @@ class SendNotificationWorkflowStatusItem(WebserviceCallStatusItem):
                 users.append(formdata.get_user())
                 continue
 
-            dest = formdata.get_role_translation(dest)
+            for dest_id in formdata.get_function_roles(dest):
-            try:
+                try:
-                role = get_publisher().role_class.get(dest)
+                    role = get_publisher().role_class.get(dest_id)
-            except KeyError:
+                except KeyError:
-                continue
+                    continue
-            users.extend(get_publisher().user_class.get_users_with_role(role.id))
+                users.extend(get_publisher().user_class.get_users_with_role(role.id))
 
         for user in users:
             if not user or not user.is_active:

wcs/workflows.py

@@ -531,10 +531,12 @@ class Workflow(StorableObject):
                     if '_submitter' in (trigger.roles or []) and formdata.is_submitter(user):
                         actions.append(action)
                         break
-                    roles = [
+                    roles = set()
-                        formdata.get_role_translation(x) for x in (trigger.roles or []) if x != '_submitter'
+                    for role_id in trigger.roles or []:
-                    ]
+                        if role_id == '_submitter':
-                    if set(roles).intersection(user.get_roles()):
+                            continue
+                        roles |= formdata.get_function_roles(role_id)
+                    if roles.intersection(user.get_roles()):
                         actions.append(action)
                         break
         return actions
@@ -1642,8 +1644,7 @@ class WorkflowStatus:
                         continue
                     if user is None:
                         continue
-                    role = filled.get_role_translation(role)
+                    if filled.get_function_roles(role).intersection(user.get_roles()):
-                    if role in user.get_roles():
                         break
                 else:
                     continue
@@ -1738,9 +1739,8 @@ class WorkflowStatus:
 
         for role in visibility_roles:
             if role != '_submitter':
-                role = formdata.get_role_translation(role)
+                if formdata.get_function_roles(role).intersection(user_roles):
-            if role in user_roles:
+                    return True
-                return True
         return False
 
     def is_endpoint(self):
@@ -1940,8 +1940,7 @@ class WorkflowStatusItem(XmlSerialisable):
                 continue
             if not user:
                 continue
-            role = formdata.get_role_translation(role)
+            if formdata.get_function_roles(role).intersection(user.get_roles()):
-            if role in user.get_roles():
                 return True
 
         return False
@@ -2955,13 +2954,12 @@ class SendmailWorkflowStatusItem(WorkflowStatusItem):
                     addresses.append(submitter_email)
                 continue
 
-            dest = formdata.get_role_translation(dest)
+            for real_dest in formdata.get_function_roles(dest):
-
+                try:
-            try:
+                    role = get_publisher().role_class.get(real_dest)
-                role = get_publisher().role_class.get(dest)
+                except KeyError:
-            except KeyError:
+                    continue
-                continue
+                addresses.extend(role.get_emails())
-            addresses.extend(role.get_emails())
 
         if not addresses:
             return