[Mpuls-commits] r573 - in wasko/branches/1.0.5: . waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES

[scm-commit@wald.intevation.org]

Author: frank
Date: 2009-08-18 11:09:17 +0200 (Tue, 18 Aug 2009)
New Revision: 573

Modified:
   wasko/branches/1.0.5/ChangeLog.txt
   wasko/branches/1.0.5/waskaweb/controllers/case_overview.py
   wasko/branches/1.0.5/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
Log:
Ported from trunk some fixes implemented by Torsten Irlaender:
Fixed issue392 and issue398


Modified: wasko/branches/1.0.5/ChangeLog.txt
===================================================================
--- wasko/branches/1.0.5/ChangeLog.txt	2009-08-14 10:05:18 UTC (rev 572)
+++ wasko/branches/1.0.5/ChangeLog.txt	2009-08-18 09:09:17 UTC (rev 573)
@@ -1,3 +1,18 @@
+2009-08-14	Frank Koormann <frank.koormann at intevation.de>
+
+	Ported from trunk some fixes implemented by
+	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+
+	Fixed issue392
+
+	* waskaweb/controllers/case_overview.py: Fixed name of sortfield.
+
+	Fixed issue398
+
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/templates/administration/account_deactivated.mako: Removed
+	  optionlist. 
+
 2009-07-07	Sascha L. Teichmann	<sascha.teichmann at intevation.de>
 
 	* waskaweb/model/semantic.py: Fixed issue426

Modified: wasko/branches/1.0.5/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/branches/1.0.5/waskaweb/controllers/case_overview.py	2009-08-14 10:05:18 UTC (rev 572)
+++ wasko/branches/1.0.5/waskaweb/controllers/case_overview.py	2009-08-18 09:09:17 UTC (rev 573)
@@ -245,7 +245,7 @@
         if sort_field == "name_1":
             search_options.append('sort_field:name')
         if sort_field == "vorname_1":
-            search_options.append('sort_field:vorname')
+            search_options.append('sort_field:m.vorname')
         if sort_field == "zugriff":
             search_options.append('sort_field:zugriff')
         if sort_field == "kundennummer":

Modified: wasko/branches/1.0.5/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/branches/1.0.5/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-08-14 10:05:18 UTC (rev 572)
+++ wasko/branches/1.0.5/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-08-18 09:09:17 UTC (rev 573)
@@ -470,7 +470,7 @@
 
 #: waskaweb/templates/administration/account_deactivated.mako:4
 msgid "adm_con_ad_account_deactivated"
-msgstr "Dieser Account wurde deaktiviert. Dies kann mehrere Ursachen haben:"
+msgstr "Dieser Account wurde deaktiviert."
 
 #: waskaweb/templates/administration/account_deactivated.mako:10
 msgid "adm_con_ad_contact_admin"