Moved approvals management actions from main action bar to signing fieldset action bar

Author: chris-adam

imio/dms/mail/browser/actionspanel.py

@@ -164,7 +164,7 @@ class SigningFieldsetActionsPanelView(ActionsPanelView):
 
     def __init__(self, context, request):
         super(SigningFieldsetActionsPanelView, self).__init__(context, request)
-        self.SECTIONS_TO_RENDER = ("renderEdit",)
+        self.ACCEPTABLE_ACTIONS = ["edit", "approvals"]
 
     @property
     def fieldset(self):
@@ -175,6 +175,27 @@ def renderEdit(self):
             return ViewPageTemplateFile("templates/fieldset_actions_panel_edit.pt")(self)
         return ""
 
+    @ram.cache(actionspanelview_cachekey)
+    def SigningFieldsetActionsPanelView__call__(
+        self,
+        useIcons=True,
+        showEdit=True,
+        showOwnDelete=False,
+        showTransitions=False,
+        **kwargs
+    ):
+        super(SigningFieldsetActionsPanelView, self).__call__(
+            useIcons=useIcons,
+            showEdit=showEdit,
+            showOwnDelete=showOwnDelete,
+            showTransitions=showTransitions,
+            **kwargs
+        )
+        self.saveHasActions()  # To remove dash "-" when no actions available
+        return self.index()
+
+    __call__ = SigningFieldsetActionsPanelView__call__
+
 
 class DmsOMActionsPanelView(ActionsPanelView):
 
@@ -203,7 +224,7 @@ def __init__(self, context, request):
         super(DmsOMActionsPanelView, self).__init__(context, request)
         # portal_actions.object_buttons action ids to keep
         # self.ACCEPTABLE_ACTIONS = ['copy', 'paste', 'delete']
-        self.ACCEPTABLE_ACTIONS = ["delete", 'approvals']
+        self.ACCEPTABLE_ACTIONS = ["delete"]
         self.SECTIONS_TO_RENDER += (
             "render_create_from_template_button",
             "render_create_new_message",
@@ -295,14 +316,13 @@ def DmsOMActionsPanelView__call__(
 
 
 class DmsFileActionsPanelView(ActionsPanelView):
-
     def __init__(self, context, request):
         super(DmsFileActionsPanelView, self).__init__(context, request)
         self.ACCEPTABLE_ACTIONS = ["edit", "external_edit", "mailing", "documentviewer_convert", "download", "delete"]
 
     def listObjectButtonsActions(self):
         actions = super(DmsFileActionsPanelView, self).listObjectButtonsActions()
-        actions.sort(key=lambda x: self.ACCEPTABLE_ACTIONS.index(x['id']))
+        actions.sort(key=lambda x: self.ACCEPTABLE_ACTIONS.index(x["id"]))
         return actions