[Mpuls-commits] r754 - in waska/trunk/waskaweb: controllers templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-01-14 12:46:26 +0100 (Thu, 14 Jan 2010)
New Revision: 754

Modified:
   waska/trunk/waskaweb/controllers/case_overview.py
   waska/trunk/waskaweb/controllers/waska.py
   waska/trunk/waskaweb/templates/casemanagement/listbadcases.mako
Log:
Issue903


Modified: waska/trunk/waskaweb/controllers/case_overview.py
===================================================================
--- waska/trunk/waskaweb/controllers/case_overview.py	2010-01-14 10:47:19 UTC (rev 753)
+++ waska/trunk/waskaweb/controllers/case_overview.py	2010-01-14 11:46:26 UTC (rev 754)
@@ -315,13 +315,13 @@
                     if h.hasRole(['cm_ka']):
                         s = "state:1;state:2;own:%s;only_cases_after:'%s';inconsistency:%s" % (user.id, INCONSISTENCY_CHECK_AFTER, k)
                     else:
-                        s = "state:4;only_cases_after:'%s';inconsistency:%s" % (INCONSISTENCY_CHECK_AFTER, k)
+                        s = "state:1;state:2;state:4;only_cases_after:'%s';inconsistency:%s" % (INCONSISTENCY_CHECK_AFTER, k)
 
                 else:
                     if h.hasRole(['cm_ka']):
                         s = 'state:1;state:2;own:%s;inconsistency:%s' % (user.id, k)
                     else:
-                        s = 'state:4;inconsistency:%s' % (k)
+                        s = 'state:1;state:2;state:4;inconsistency:%s' % (k)
                 l = CaseOverview().search(s)
                 c.inconsistency_types[k] = l
         except StandardError, err:

Modified: waska/trunk/waskaweb/controllers/waska.py
===================================================================
--- waska/trunk/waskaweb/controllers/waska.py	2010-01-14 10:47:19 UTC (rev 753)
+++ waska/trunk/waskaweb/controllers/waska.py	2010-01-14 11:46:26 UTC (rev 754)
@@ -94,9 +94,9 @@
                 #Search inconsistencys on phases but ignore older cases. 
                 search_str2 = "state:1;state:2;bad:clearing_start;bad:clearing_ende;bad:beratung_start;bad:beratung_ende;bad:cm_start;bad:cm_ende;bad:nachbetreuung_start;bad:nachbetreuung_ende;only_cases_after:'%s';own:%s" % (INCONSISTENCY_CHECK_AFTER, user.id)
             else:
-                search_str1 = "state:4;bad:1;bad:2;bad:3;bad:4;bad:5;bad:6;bad:7;own:%s" % user.id
+                search_str1 = "state:1;state:2;state:4;bad:1;bad:2;bad:3;bad:4;bad:5;bad:6;bad:7;own:%s" % user.id
                 #Search inconsistencys on phases but ignore older cases. 
-                search_str2 = "state:4;bad:clearing_start;bad:clearing_ende;bad:beratung_start;bad:beratung_ende;bad:cm_start;bad:cm_ende;bad:nachbetreuung_start;bad:nachbetreuung_ende;only_cases_after:'%s';own:%s" % (INCONSISTENCY_CHECK_AFTER, user.id)
+                search_str2 = "state:1;state:2;state:4;bad:clearing_start;bad:clearing_ende;bad:beratung_start;bad:beratung_ende;bad:cm_start;bad:cm_ende;bad:nachbetreuung_start;bad:nachbetreuung_ende;only_cases_after:'%s';own:%s" % (INCONSISTENCY_CHECK_AFTER, user.id)
 
             error_cases1 = Set(c.id for c in CaseOverview().search(search_str1))
             error_cases2 = Set(c.id for c in CaseOverview().search(search_str2))

Modified: waska/trunk/waskaweb/templates/casemanagement/listbadcases.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/listbadcases.mako	2010-01-14 10:47:19 UTC (rev 753)
+++ waska/trunk/waskaweb/templates/casemanagement/listbadcases.mako	2010-01-14 11:46:26 UTC (rev 754)
@@ -46,6 +46,7 @@
                 <input type="hidden" name="show_open" value="1">
                 <input type="hidden" name="search_str" value="inconsistency:${k};only_cases_after:${start_date}'">
               % else:
+                <input type="hidden" name="show_open" value="1">
                 <input type="hidden" name="show_markanonymize" value="1">
                 <input type="hidden" name="search_str" value="inconsistency:${k};only_cases_after:${start_date}'">
               % endif
@@ -55,6 +56,7 @@
                 <input type="hidden" name="show_open" value="1">
                 <input type="hidden" name="search_str" value="inconsistency:${k}">
               % else:
+                <input type="hidden" name="show_open" value="1">
                 <input type="hidden" name="show_markanonymize" value="1">
                 <input type="hidden" name="search_str" value="inconsistency:${k}">
               % endif