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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-09-15 08:57:08 +0200 (Wed, 15 Sep 2010)
New Revision: 3638

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/model/logbook.py
   base/trunk/mpulsweb/templates/logbook/overview.mako
Log:
issue1078: sort logbook entries by editor

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-09-15 06:35:03 UTC (rev 3637)
+++ base/trunk/ChangeLog	2010-09-15 06:57:08 UTC (rev 3638)
@@ -1,4 +1,4 @@
-2010-09-14  Bernhard Herzog  <bh at intevation.de>
+2010-09-15  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/controllers/case_bundle.py
 	(CaseBundleController._build_casebundle): Simplify by using the
@@ -42,6 +42,12 @@
 
 2010-09-14  Roland Geider <roland.geider at intevation.de>
 
+	* mpulsweb/model/logbook.py,
+	  mpulsweb/templates/logbook/overview.mako: issue1078: can't sort
+	  logbook entries by editor
+
+2010-09-14  Roland Geider <roland.geider at intevation.de>
+
 	* mpulsweb/templates/privacy/default/privacy_statement.html:
 	  issue1064: consistent use of the word "Einwilligungserklaerung"
 	  for the declaration of consent

Modified: base/trunk/mpulsweb/model/logbook.py
===================================================================
--- base/trunk/mpulsweb/model/logbook.py	2010-09-15 06:35:03 UTC (rev 3637)
+++ base/trunk/mpulsweb/model/logbook.py	2010-09-15 06:57:08 UTC (rev 3638)
@@ -40,7 +40,7 @@
 
 KIND2TEXT = g.mpuls_config.get('logbook', 'descriptions')[0]
 
-ALLOWED_SORTING = ['name', 'art', 'dauer', 'datum', 'asc', 'desc', 'nachname']
+ALLOWED_SORTING = ['name', 'art', 'dauer', 'datum', 'asc', 'desc', 'bearbeiter']
 LOAD_LOGBOOK = """
 SELECT l.id AS id, datum, bearbeiter, art, kurz_notiz, notiz, dauer
 FROM ka_logbuch_tbl_view l WHERE l.master_id = %s

Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako	2010-09-15 06:35:03 UTC (rev 3637)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako	2010-09-15 06:57:08 UTC (rev 3638)
@@ -38,12 +38,12 @@
     </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',
+                           id=session.get('case').id, sort_field='bearbeiter',
                            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', 
+                           id=session.get('case').id, sort_field='bearbeiter', 
                            sort_order='desc')}"
          ><img class="sorticon"
                src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>