move full getAction() method to base view; provide 'append_action' options for putting actions from options after internally assigned actions

browser/common.py

@@ -52,6 +52,7 @@ from zope.traversing.browser import absoluteURL
 from zope.traversing.api import getName, getParent, traverse
 
 from cybertools.ajax.dojo import dojoMacroTemplate
+from cybertools.browser.action import actions
 from cybertools.browser.view import GenericView
 from cybertools.meta.interfaces import IOptions
 from cybertools.meta.element import Element
@@ -720,10 +721,21 @@ class BaseView(GenericView, I18NView):
         """ Return a list of actions that provide the view and edit actions
             available for the context object.
         """
-        actions = []
+        acts = []
+        optKey = 'action.' + category
+        actNames = (self.options(optKey) or []) + (self.typeOptions(optKey) or [])
+        if actNames:
+            acts = list(actions.get(category, actNames,
+                                    view=self, page=page, target=target))
         if category in self.actions:
-            actions.extend(self.actions[category](self, page=page, target=target))
-        return actions
+            acts.extend(self.actions[category](self, page, target))
+        optKey = 'append_action.' + category
+        actNames = (self.options(optKey) or []) + (self.typeOptions(optKey) or [])
+        if actNames:
+            acts.extend(list(actions.get(category, actNames,
+                                    view=self, page=page, target=target)))
+        return acts
+
 
     def getAdditionalActions(self, category='object', page=None, target=None):
         """ Provide additional actions; override by subclass.

browser/concept.py

@@ -535,17 +535,6 @@ class ConceptView(BaseView):
         for node in self.context.getClients():
             yield NodeView(node, self.request)
 
-    def getActions(self, category='object', page=None, target=None):
-        acts = []
-        optKey = 'action.' + category
-        actNames = (self.options(optKey) or []) + (self.typeOptions(optKey) or [])
-        if actNames:
-            acts = list(actions.get(category, actNames,
-                                    view=self, page=page, target=target))
-        if category in self.actions:
-            acts.extend(self.actions[category](self, page, target))
-        return acts
-
     def getPortletActions(self, page=None, target=None):
         if self.portlet_actions:
             return actions.get('portlet', self.portlet_actions,