diff --git a/browser/common.py b/browser/common.py index a426dbc..1a0b56f 100755 --- a/browser/common.py +++ b/browser/common.py @@ -966,7 +966,7 @@ class LoggedIn(object): code = 'error' message = self.messages[code] return self.request.response.redirect(self.nextUrl(message, code)) - + def nextUrl(self, message, code): camefrom = self.request.form.get('camefrom', '').strip('?') url = camefrom or self.request.URL[-1] diff --git a/browser/concept.py b/browser/concept.py index cb2027a..32b63fc 100644 --- a/browser/concept.py +++ b/browser/concept.py @@ -199,7 +199,7 @@ class BaseRelationView(BaseView): @Lazy def relationInfo(self): - predInfo = ', ' .join(p.title for p in self.predicates + predInfo = ', ' .join(p.title for p in self.predicates if p != self.defaultPredicate) return ' | '.join(t for t in (self.description, predInfo) if t) @@ -210,7 +210,7 @@ class ConceptView(BaseView): templateName = 'concept.standard' macroName = 'conceptdata' partPrefix = 'part_' - defaultParts = ('title', 'fields', + defaultParts = ('title', 'fields', 'children', 'resources', 'workitems', 'comments',) def childViewFactory(self, *args, **kw): diff --git a/browser/node.py b/browser/node.py index 4e23537..51939e0 100755 --- a/browser/node.py +++ b/browser/node.py @@ -158,7 +158,7 @@ class NodeView(BaseView): # check if there are any available actions; # store list of actions in macro object (evaluate only once) actions = [act for act in self.getAllowedActions('portlet', - target=self.virtualTarget) + target=self.virtualTarget) if act.condition] if actions: cm.register('portlet_right', 'actions', title=_(u'Actions'), @@ -551,14 +551,14 @@ class NodeView(BaseView): self.registerDojoFormAll() if target is None: target = self.virtualTarget - #target = self.getViewForTarget(self.virtualTargetObject, + #target = self.getViewForTarget(self.virtualTargetObject, # setup=False) if category in self.actions: actions.extend(self.actions[category](self, target=target)) if target is not None and self.setupTarget: actions.extend(target.getActions( category, page=self, target=target)) - if target is not None and target.context != self.virtualTargetObject: + if target is not None and target.context != self.virtualTargetObject: # self view must be used directly for target actions.extend(self.view.getAdditionalActions( category, self, target)) diff --git a/expert/browser/report.pt b/expert/browser/report.pt index 5713806..02b78b9 100755 --- a/expert/browser/report.pt +++ b/expert/browser/report.pt @@ -6,7 +6,7 @@ reportView nocall:item" tal:attributes="class string:content-$level;"> -
+