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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-27 16:16:42 +0100 (Wed, 27 Jan 2010)
New Revision: 952

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/lib/search.py
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py (Case.__init__): Remove instance variable
privacy_statement_signed.  It's not used anywhere.
(CaseFactory.loadByName): Remove parameter einverst and don't
assign it to the case object's privacy_statement_signed.
(CaseOverview.search): Don't pass
row['einverstaendniserklaerung'] to loadByName

* waskaweb/lib/search.py (SEARCH_CASE_SQL): Remove column
einverstaendniserklaerung from the search result. It's not used
anymore.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-27 15:06:00 UTC (rev 951)
+++ wasko/branches/2.0/ChangeLog	2010-01-27 15:16:42 UTC (rev 952)
@@ -1,5 +1,18 @@
 2010-01-27  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/case.py (Case.__init__): Remove instance variable
+	privacy_statement_signed.  It's not used anywhere.
+	(CaseFactory.loadByName): Remove parameter einverst and don't
+	assign it to the case object's privacy_statement_signed.
+	(CaseOverview.search): Don't pass
+	row['einverstaendniserklaerung'] to loadByName
+
+	* waskaweb/lib/search.py (SEARCH_CASE_SQL): Remove column
+	einverstaendniserklaerung from the search result. It's not used
+	anymore.
+
+2010-01-27  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/lib/search.py (SEARCH_CASE_SQL): Remove columns
 	zeitraum_nachbetreuung and art_beendigung from the search result.
 	They're not used anymore.

Modified: wasko/branches/2.0/waskaweb/lib/search.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/search.py	2010-01-27 15:06:00 UTC (rev 951)
+++ wasko/branches/2.0/waskaweb/lib/search.py	2010-01-27 15:16:42 UTC (rev 952)
@@ -55,7 +55,6 @@
       st.status,
       st.zugriff,
       st.id as s_id,
-      m.einwilligung as einverstaendniserklaerung
     FROM master_tbl_view m
     JOIN ka_status_tbl_view st ON
     m.id = st.master_id

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-01-27 15:06:00 UTC (rev 951)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-01-27 15:16:42 UTC (rev 952)
@@ -377,7 +377,6 @@
                                       row['name'],
                                       row['fn'],
                                       row['bearbeiter_id'],
-                                      row['einverstaendniserklaerung'],
                                       row['s_id'],
                                       row['status'],
                                       row['zugriff'])
@@ -424,7 +423,7 @@
         return case
 
     def loadByName(self, id, first_name, last_name, knr, bearbeiter_id,
-                   einverst, s_id, s_state, s_access):
+                   s_id, s_state, s_access):
         """This method does not actually loads a case from the database. It
         just returns a case object initiated with the provided parameters"""
         case = Case()
@@ -435,7 +434,6 @@
         case.editor     = bearbeiter_id
         case.state      = State()
         case.state.setData(s_id, id, s_state, s_access)
-        case.privacy_statement_signed = einverst in (1, -1) and True or False
         return case
 
     def createNew(self, init=True, uuid=None, data=None):
@@ -811,7 +809,6 @@
         self.page                     = None
         self.documents                = []
         self.appointments             = []
-        self.privacy_statement_signed = False
         self.privacy_statement        = None
         self.aidplan_statement        = None
         self.discretion_statement     = None