Mercurial > p > roundup > code
diff templates/classic/html/issue.index.html @ 3696:790363e96852
Sorting/grouping by multiple properties.
- Implement sorting/grouping by multiple properties for the web
interface. I'm now using @sort0/@sortdir0,@sort1/@sortdir1,... and
@group0/@groupdir0,... when generating URLs from a search template.
These are converted to a list internally. When saving URLs (e.g. when
storing queries) I'm using @sort=prop1,prop2,... and @group=... with
optional '-' prepended to individual props.
This means saved URLs are backward compatible with existing trackers
(and yes, this was a design goal).
I need the clumsy version with @sort0,@sort1 etc, because I'm
currently using several selectors and checkboxes (as the classic
template does, too). I don't think there is a way around that in HTML?
- Updated (hopefully all) documentation to reflect the new URL format
and the consequences in the web-interface.
- I've set the number of sort/group properties in the classic template
to two -- this can easily be reverted by changing n_sort to 1.
Richard, would you look over these changes? I've set a tag before and
(will set) after commit, so that it would be easy to merge out.
Don't be too scared about the size of the change, most is documentation,
the guts are in cgi/templating.py and small changes in the classic
template.
| author | Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net> |
|---|---|
| date | Wed, 30 Aug 2006 20:28:26 +0000 |
| parents | 1671d1e39b1a |
| children | 18def94e5150 |
line wrap: on
line diff
--- a/templates/classic/html/issue.index.html Wed Aug 30 09:35:31 2006 +0000 +++ b/templates/classic/html/issue.index.html Wed Aug 30 20:28:26 2006 +0000 @@ -31,10 +31,12 @@ <th tal:condition="request/show/assignedto" i18n:translate="">Assigned To</th> </tr> <tal:block tal:repeat="i batch"> - <tr tal:define="group python:request.group[1]" - tal:condition="python:group and batch.propchanged(group)"> - <th tal:attributes="colspan python:len(request.columns)" - tal:content="python:str(i[group]) or '(no %s set)'%group" class="group"> + <tr tal:define="group python:[r[1] for r in request.group]" + tal:condition="python:group and batch.propchanged(*group)"> + <th tal:attributes="colspan python:len(request.columns)" class="group"> + <tal:block tal:repeat="g group"> + <tal:block tal:content="python:str(i[g]) or '(no %s set)'%g"/> + </tal:block> </th> </tr> @@ -100,41 +102,49 @@ <form method="GET" class="index-controls" tal:attributes="action request/classname"> - <table class="form"> - <tr tal:condition="batch"> - <th i18n:translate="">Sort on:</th> + <table class="form" tal:define="n_sort python:2"> + <tal:block tal:repeat="n python:range(n_sort)" tal:condition="batch"> + <tr tal:define="key python:len(request.sort)>n and request.sort[n]"> + <th> + <tal:block tal:condition="not:n" i18n:translate="">Sort on:</tal:block> + </th> <td> - <select name="@sort"> + <select tal:attributes="name python:'@sort%d'%n"> <option value="" i18n:translate="">- nothing -</option> <option tal:repeat="col context/properties" tal:attributes="value col/_name; - selected python:col._name == request.sort[1]" + selected python:key and col._name == key[1]" tal:content="col/_name" i18n:translate="">column</option> </select> </td> <th i18n:translate="">Descending:</th> <td><input type="checkbox" name="@sortdir" - tal:attributes="checked python:request.sort[0] == '-'"> + tal:attributes="checked python:key and key[0] == '-'"> </td> </tr> - <tr> - <th i18n:translate="">Group on:</th> + </tal:block> + <tal:block tal:repeat="n python:range(n_sort)" tal:condition="batch"> + <tr tal:define="key python:len(request.group)>n and request.group[n]"> + <th> + <tal:block tal:condition="not:n" i18n:translate="">Group on:</tal:block> + </th> <td> - <select name="@group"> + <select tal:attributes="name python:'@group%d'%n"> <option value="" i18n:translate="">- nothing -</option> <option tal:repeat="col context/properties" tal:attributes="value col/_name; - selected python:col._name == request.group[1]" + selected python:key and col._name == key[1]" tal:content="col/_name" i18n:translate="">column</option> </select> </td> <th i18n:translate="">Descending:</th> <td><input type="checkbox" name="@groupdir" - tal:attributes="checked python:request.group[0] == '-'"> + tal:attributes="checked python:key and key[0] == '-'"> </td> </tr> + </tal:block> <tr><td colspan="4"> <input type="submit" value="Redisplay" i18n:attributes="value"> <tal:block tal:replace="structure