[Mpuls-commits] r949 - in wasko/branches/2.0: . waskaweb/lib waskaweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-27 15:45:40 +0100 (Wed, 27 Jan 2010)
New Revision: 949

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/lib/search.py
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/lib/search.py (SEARCH_CASE_SQL),
waskaweb/model/case.py (CaseOverview.search): use the formed names
for name, vorname, fn in the search API


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-27 14:20:53 UTC (rev 948)
+++ wasko/branches/2.0/ChangeLog	2010-01-27 14:45:40 UTC (rev 949)
@@ -1,5 +1,11 @@
 2010-01-27  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/search.py (SEARCH_CASE_SQL),
+	waskaweb/model/case.py (CaseOverview.search): use the formed names
+	for name, vorname, fn in the search API
+
+2010-01-27  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/casemanagement/static_form/statement.mako:
 	Removed.  Not used.
 

Modified: wasko/branches/2.0/waskaweb/lib/search.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/search.py	2010-01-27 14:20:53 UTC (rev 948)
+++ wasko/branches/2.0/waskaweb/lib/search.py	2010-01-27 14:45:40 UTC (rev 949)
@@ -48,9 +48,9 @@
 SEARCH_CASE_SQL = \
 """ SELECT
       m.id,
-      m.name as name_1,
-      m.vorname as vorname_1,
-      m.fn as kundennummer,
+      m.name,
+      m.vorname,
+      m.fn,
       m.bearbeiter_id,
       st.status,
       st.zugriff,

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-01-27 14:20:53 UTC (rev 948)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-01-27 14:45:40 UTC (rev 949)
@@ -373,9 +373,9 @@
         factory = CaseFactory()
         for row in result:
             case = factory.loadByName(row['id'],
-                                      row['vorname_1'],
-                                      row['name_1'],
-                                      row['kundennummer'],
+                                      row['vorname'],
+                                      row['name'],
+                                      row['fn'],
                                       row['bearbeiter_id'],
                                       row['einverstaendniserklaerung'],
                                       row['s_id'],