[Mpuls-commits] r811 - in wasko/branches/2.0: . waskaweb/controllers waskaweb/model waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-21 17:46:18 +0100 (Thu, 21 Jan 2010)
New Revision: 811

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/controllers/case_overview.py
   wasko/branches/2.0/waskaweb/model/case.py
   wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako
Log:
* waskaweb/templates/casemanagement/overview.mako: Removed
commented out check_validity bundle action.

* waskaweb/controllers/case_overview.py
(CaseOverviewController.bundleAction): Remove check_validity
bundle action.  It was commented out anyway.

* waskaweb/model/case.py (CaseBundle.checkValidity)
(Case.checkValidity): Removed.  Not used anywhere.


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:29:42 UTC (rev 810)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:46:18 UTC (rev 811)
@@ -1,5 +1,17 @@
 2010-01-21  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/templates/casemanagement/overview.mako: Removed
+	commented out check_validity bundle action.
+
+	* waskaweb/controllers/case_overview.py
+	(CaseOverviewController.bundleAction): Remove check_validity
+	bundle action.  It was commented out anyway.
+
+	* waskaweb/model/case.py (CaseBundle.checkValidity)
+	(Case.checkValidity): Removed.  Not used anywhere.
+
+2010-01-21  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/casemanagement/overview.mako: Remove evalue
 	bundle action.  It was commented out anyway.
 

Modified: wasko/branches/2.0/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case_overview.py	2010-01-21 16:29:42 UTC (rev 810)
+++ wasko/branches/2.0/waskaweb/controllers/case_overview.py	2010-01-21 16:46:18 UTC (rev 811)
@@ -440,11 +440,6 @@
                 session.save()
                 return self.exportXML(1)
 
-            elif action == 'check_validity':
-                if case_bundle.isEmpty(): return self._emptyListError()
-                session['casebundle'] = case_bundle
-                session.save()
-                return self.checkValidity(1)
             else:
                 raise HTTPNotFound()
 

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-01-21 16:29:42 UTC (rev 810)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-01-21 16:46:18 UTC (rev 811)
@@ -239,18 +239,6 @@
     def __init__(self, case_ids=None):
         CaseList.__init__(self, case_ids)
 
-    def checkValidity(self):
-        factory = CaseFactory()
-        num = 0
-        for id in self.case_list:
-            case = factory.loadById(id)
-            try:
-                if case.checkValidity():
-                    num += 1
-            except:
-                print >> sys.stderr, "Could not set editor for case in bundle"
-        return num
-
     def setEditor(self, user_id):
         factory = CaseFactory()
         num = 0
@@ -1049,22 +1037,6 @@
             db.recycleConnection(con, cur)
         return self.editor
 
-    def checkValidity(self):
-        '''Call remote function which will check how valid the case is'''
-        con, curr = None, None
-        try:
-            con = db.getConnection()
-            cur = con.cursor()
-            try:
-                cur.execute('SELECT check_case(%s)' % self.id)
-            except:
-                con.rollback()
-                return False 
-            con.commit()
-        finally:
-            db.recycleConnection(con, cur)
-        return True
-
     def getPage(self, datapage=None):
         '''Returns a datapage with the given name of the case'''
         if not self.page is None: 

Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako	2010-01-21 16:29:42 UTC (rev 810)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako	2010-01-21 16:46:18 UTC (rev 811)
@@ -40,7 +40,6 @@
       <option value="exportXLS">Als Excel-Tabellen exportieren</option>
       <option value="exportXML">Als XML-Datei exportieren</option>
       <option value="exportCSV">Als CSV-Datei exportieren</option>
-      ##<option value="check_validity">Validität überprüfen</option>
       % endif
     </select>
   </div>