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

add css class to report meta

Browse source
This commit is contained in:
hplattner 2014-03-31 13:26:12 +02:00
parent 40cc2c4079
commit 888fb8d62c
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/common.py
View file

@ -966,7 +966,7 @@ class LoggedIn(object):
code = 'error' code = 'error'
message = self.messages[code] message = self.messages[code]
return self.request.response.redirect(self.nextUrl(message, code)) return self.request.response.redirect(self.nextUrl(message, code))
def nextUrl(self, message, code): def nextUrl(self, message, code):
camefrom = self.request.form.get('camefrom', '').strip('?') camefrom = self.request.form.get('camefrom', '').strip('?')
url = camefrom or self.request.URL[-1] url = camefrom or self.request.URL[-1]

4
browser/concept.py
View file

@ -199,7 +199,7 @@ class BaseRelationView(BaseView):
@Lazy @Lazy
def relationInfo(self): 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) if p != self.defaultPredicate)
return ' | '.join(t for t in (self.description, predInfo) if t) return ' | '.join(t for t in (self.description, predInfo) if t)
@ -210,7 +210,7 @@ class ConceptView(BaseView):
templateName = 'concept.standard' templateName = 'concept.standard'
macroName = 'conceptdata' macroName = 'conceptdata'
partPrefix = 'part_' partPrefix = 'part_'
defaultParts = ('title', 'fields', defaultParts = ('title', 'fields',
'children', 'resources', 'workitems', 'comments',) 'children', 'resources', 'workitems', 'comments',)
def childViewFactory(self, *args, **kw): def childViewFactory(self, *args, **kw):

6
browser/node.py
View file

@ -158,7 +158,7 @@ class NodeView(BaseView):
# check if there are any available actions; # check if there are any available actions;
# store list of actions in macro object (evaluate only once) # store list of actions in macro object (evaluate only once)
actions = [act for act in self.getAllowedActions('portlet', actions = [act for act in self.getAllowedActions('portlet',
target=self.virtualTarget) target=self.virtualTarget)
if act.condition] if act.condition]
if actions: if actions:
cm.register('portlet_right', 'actions', title=_(u'Actions'), cm.register('portlet_right', 'actions', title=_(u'Actions'),
@ -551,14 +551,14 @@ class NodeView(BaseView):
self.registerDojoFormAll() self.registerDojoFormAll()
if target is None: if target is None:
target = self.virtualTarget target = self.virtualTarget
#target = self.getViewForTarget(self.virtualTargetObject, #target = self.getViewForTarget(self.virtualTargetObject,
# setup=False) # setup=False)
if category in self.actions: if category in self.actions:
actions.extend(self.actions[category](self, target=target)) actions.extend(self.actions[category](self, target=target))
if target is not None and self.setupTarget: if target is not None and self.setupTarget:
actions.extend(target.getActions( actions.extend(target.getActions(
category, page=self, target=target)) 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 # self view must be used directly for target
actions.extend(self.view.getAdditionalActions( actions.extend(self.view.getAdditionalActions(
category, self, target)) category, self, target))

2
expert/browser/report.pt
View file

@ -6,7 +6,7 @@
reportView nocall:item" reportView nocall:item"
tal:attributes="class string:content-$level;"> tal:attributes="class string:content-$level;">
<metal:block use-macro="view/concept_macros/concepttitle" /> <metal:block use-macro="view/concept_macros/concepttitle" />
<form method="post" name="report_data"> <form method="post" name="report_data" class="report-meta">
<tal:hidden define="params item/dynamicParams" <tal:hidden define="params item/dynamicParams"
tal:condition="nothing"> tal:condition="nothing">
<input type="hidden" <input type="hidden"

2
schema/field.py
View file

@ -89,7 +89,7 @@ class RelationFieldInstance(FieldInstance, BaseRelationFieldInstance):
def marshall(self, value): def marshall(self, value):
if value: if value:
return dict(title=value.title, return dict(title=value.title,
uid=util.getUidForObject(baseObject(value))) uid=util.getUidForObject(baseObject(value)))
def display(self, value): def display(self, value):