[Mpuls-commits] r2773 - in base/trunk: . mpulsweb/templates/logbook

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-26 17:44:06 +0200 (Wed, 26 May 2010)
New Revision: 2773

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/logbook/overview.mako
Log:
* mpulsweb/templates/logbook/overview.mako: Correct some url_for
calls.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-26 15:43:38 UTC (rev 2772)
+++ base/trunk/ChangeLog	2010-05-26 15:44:06 UTC (rev 2773)
@@ -1,5 +1,10 @@
 2010-05-26  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/logbook/overview.mako: Correct some url_for
+	calls.
+
+2010-05-26  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/logbook.py (LogbookController.show)
 	(LogbookController.newAction, LogbookController.edit)
 	(LogbookController.editAction, LogbookController.delete): Use

Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako	2010-05-26 15:43:38 UTC (rev 2772)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako	2010-05-26 15:44:06 UTC (rev 2773)
@@ -25,20 +25,52 @@
 <table class="appointment">
   <tr>
     <th class="date table_header_h">Datum
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=datum&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=datum&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', 
+                           id=session.get('case').id, sort_field='datum', 
+                           sort_order='asc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
+      <a href="${h.url_for(controller='/logbook', action='index',
+                           id=session.get('case').id, sort_field='datum', 
+                           sort_order='desc')}"
+         ><img class="sorticon" 
+               src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
     </th>
     <th class="title table_header_h">Bearbeiter
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=nachname&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=nachname&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index',
+                           id=session.get('case').id, sort_field='nachname',
+                           sort_order='asc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
+      <a href="${h.url_for(controller='/logbook', action='index',
+                           id=session.get('case').id, sort_field='nachname', 
+                           sort_order='desc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
     </th>
     <th class="title table_header_h">Art
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=art&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=art&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index',
+                           id=session.get('case').id, sort_field='art',
+                           sort_order='asc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
+      <a href="${h.url_for(controller='/logbook', action='index',
+                           id=session.get('case').id, sort_field='art',
+                           sort_order='desc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
     </th>
     <th class="title table_header_h">Dauer (min)
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=dauer&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
-      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=dauer&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index',
+                           id=session.get('case').id, sort_field='dauer',
+                           sort_order='asc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
+      <a href="${h.url_for(controller='/logbook', action='index', 
+                           id=session.get('case').id, sort_field='dauer',
+                           sort_order='desc')}"
+         ><img class="sorticon"
+               src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
     </th>
     <th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
   </tr>