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

allow overriding of default resource relation views and sorting

Browse source
This commit is contained in:
Helmut Merz 2015-03-30 13:47:04 +02:00
parent c06785b98b
commit 60604cd38b
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
browser/concept.py
View file

@ -457,7 +457,7 @@ class ConceptView(BaseView):
if r.order != pos: if r.order != pos:
r.order = pos r.order = pos
def getResources(self): def getResources(self, relView=None, sort='default'):
form = self.request.form form = self.request.form
#if form.get('loops.viewName') == 'index.html' and self.editable: #if form.get('loops.viewName') == 'index.html' and self.editable:
if self.editable: if self.editable:
@ -466,13 +466,15 @@ class ConceptView(BaseView):
tokens = form.get('resources_tokens') tokens = form.get('resources_tokens')
if tokens: if tokens:
self.reorderResources(tokens) self.reorderResources(tokens)
from loops.browser.resource import ResourceRelationView if relView is None:
from loops.browser.resource import ResourceRelationView
relView = ResourceRelationView
from loops.organize.personal.browser.filter import FilterView from loops.organize.personal.browser.filter import FilterView
fv = FilterView(self.context, self.request) fv = FilterView(self.context, self.request)
rels = self.context.getResourceRelations() rels = self.context.getResourceRelations(sort=sort)
for r in rels: for r in rels:
if fv.check(r.first): if fv.check(r.first):
view = ResourceRelationView(r, self.request, contextIsSecond=True) view = relView(r, self.request, contextIsSecond=True)
if view.checkState(): if view.checkState():
yield view yield view

16
browser/concept_macros.pt
View file

@ -370,4 +370,20 @@
</metal:actions> </metal:actions>
<metal:sortable define-macro="sortable_column_header">
<a title="tooltip_sort_column"
tal:define="colName col/name"
tal:omit-tag="python:not item.isSortableColumn(tableName, colName)"
tal:attributes="href python:item.getSortUrl(tableName, colName)"
i18n:attributes="title">
<span tal:content="col/title"
tal:attributes="class col/cssClass|nothing"
i18n:translate="" />
<img tal:define="src python:item.getSortImage(tableName, colName)"
tal:condition="src"
tal:attributes="src src" />
</a>
</metal:sortable>
</html> </html>