cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Helmut Merz 2013-09-23 14:17:00 +02:00
parent 0528718523
commit a085da0050
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
browser/common.py
View file

@ -52,6 +52,7 @@ from zope.traversing.browser import absoluteURL
from zope.traversing.api import getName, getParent, traverse from zope.traversing.api import getName, getParent, traverse
from cybertools.ajax.dojo import dojoMacroTemplate from cybertools.ajax.dojo import dojoMacroTemplate
from cybertools.browser.action import actions
from cybertools.browser.view import GenericView from cybertools.browser.view import GenericView
from cybertools.meta.interfaces import IOptions from cybertools.meta.interfaces import IOptions
from cybertools.meta.element import Element 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 """ Return a list of actions that provide the view and edit actions
available for the context object. 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: if category in self.actions:
actions.extend(self.actions[category](self, page=page, target=target)) acts.extend(self.actions[category](self, page, target))
return actions 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): def getAdditionalActions(self, category='object', page=None, target=None):
""" Provide additional actions; override by subclass. """ Provide additional actions; override by subclass.

11
browser/concept.py
View file

@ -535,17 +535,6 @@ class ConceptView(BaseView):
for node in self.context.getClients(): for node in self.context.getClients():
yield NodeView(node, self.request) 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): def getPortletActions(self, page=None, target=None):
if self.portlet_actions: if self.portlet_actions:
return actions.get('portlet', self.portlet_actions, return actions.get('portlet', self.portlet_actions,