[Mpuls-commits] r2257 - in wasko/branches/2.0: . jmdweb/lib
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Mar 29 20:43:25 CEST 2010
Author: bh
Date: 2010-03-29 20:43:20 +0200 (Mon, 29 Mar 2010)
New Revision: 2257
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/jmdweb/lib/search.py
Log:
* jmdweb/lib/search.py: Fix formatting.
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-03-29 18:40:16 UTC (rev 2256)
+++ wasko/branches/2.0/ChangeLog 2010-03-29 18:43:20 UTC (rev 2257)
@@ -1,5 +1,9 @@
2010-03-29 Bernhard Herzog <bh at intevation.de>
+ * jmdweb/lib/search.py: Fix formatting.
+
+2010-03-29 Bernhard Herzog <bh at intevation.de>
+
* jmdweb/controllers/case.py: Remove unused imports.
2010-03-29 Bernhard Herzog <bh at intevation.de>
Modified: wasko/branches/2.0/jmdweb/lib/search.py
===================================================================
--- wasko/branches/2.0/jmdweb/lib/search.py 2010-03-29 18:40:16 UTC (rev 2256)
+++ wasko/branches/2.0/jmdweb/lib/search.py 2010-03-29 18:43:20 UTC (rev 2257)
@@ -31,7 +31,7 @@
from datetime import datetime
from mpulsweb.lib.security import hasRole
-from mpulsweb.lib.search import CaseSearch as CaseBaseSearch
+from mpulsweb.lib.search import CaseSearch as CaseBaseSearch
SEARCH_WHERE = """
%s
@@ -51,9 +51,11 @@
log = logging.getLogger(__name__)
+
class CaseSearch(CaseBaseSearch):
- def __get_where(self, search, options, allowed_states, bad_types, phaseslist, fieldsdic):
+ def __get_where(self, search, options, allowed_states, bad_types,
+ phaseslist, fieldsdic):
# Ansicht eigene Fallakten / Vertretung
which_user = 0
allowed_viewer = "FALSE"
@@ -178,8 +180,10 @@
migration = ("(nat_staat = 2"
" and (vater_staat != 2 or mutter_staat != 2))")
- return SEARCH_WHERE % (needle_expr, ",".join([str(x) for x in allowed_states]),
- ee, allowed_viewer, editor, gender, time_interval,
- phases, branch, fkz, bad, only_cases_after, migration)
+ return SEARCH_WHERE % (needle_expr,
+ ",".join([str(x) for x in allowed_states]),
+ ee, allowed_viewer, editor, gender,
+ time_interval, phases, branch, fkz, bad,
+ only_cases_after, migration)
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
More information about the Mpuls-commits
mailing list