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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-11 20:16:12 +0100 (Thu, 11 Feb 2010)
New Revision: 1525

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py (Case.fields): Set search_retrieve and
search_match on the appropriate fields.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-11 19:12:07 UTC (rev 1524)
+++ wasko/branches/2.0/ChangeLog	2010-02-11 19:16:12 UTC (rev 1525)
@@ -1,5 +1,10 @@
 2010-02-11  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/case.py (Case.fields): Set search_retrieve and
+	search_match on the appropriate fields.
+
+2010-02-11  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (Field.__init__): New parameters and
 	instance variables: search_retrieve and search_match.  These
 	indicate whether the field is should be retrieved from a search

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-11 19:12:07 UTC (rev 1524)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-11 19:16:12 UTC (rev 1525)
@@ -683,11 +683,11 @@
     # Definitions for some commonly used public instance attributes.
     #
     fields = [
-        Field("name", digest=True,
+        Field("name", digest=True, search_retrieve=True, search_match=True,
               alias="last_name", alias_force_string=True, session=True),
-        Field("vorname", digest=True,
+        Field("vorname", digest=True, search_retrieve=True, search_match=True,
               alias="first_name", alias_force_string=True, session=True),
-        Field("fn", digest=True,
+        Field("fn", digest=True, search_retrieve=True, search_match=True,
               alias="knr", alias_force_string=True, session=True),
         Field("geburtsdatum", digest=True),
         Field("addresse_strasse", digest=True,
@@ -716,7 +716,8 @@
 
         Field("erstgespraech", alias="first_meeting", session=True),
         Field("datum_cm_ende", alias="cm_end", session=True),
-        Field("bearbeiter_id", alias="editor", session=False),
+        Field("bearbeiter_id", search_retrieve=True,
+              alias="editor", session=False),
         ]
 
     alias_dict = dict((field.alias, field) for field in fields