Merge branch 'master' into bbmaster

This commit is contained in:
Helmut Merz 2012-05-24 07:59:53 +02:00
commit 261ca5b830

View file

@ -564,7 +564,8 @@ class NodeView(BaseView):
actions = dict(portlet=getPortletActions) actions = dict(portlet=getPortletActions)
def checkAction(self, name, category, target): def checkAction(self, name, category, target):
if name in ('create_resource',) and target is not None: #if name in ('create_resource',) and target is not None:
if target is not None:
return target.checkAction(name, category, target) return target.checkAction(name, category, target)
return super(NodeView, self).checkAction(name, category, target) return super(NodeView, self).checkAction(name, category, target)