[Mpuls-commits] r5472 - base/trunk/mpulsweb/controllers
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Oct 14 15:26:29 CEST 2011
Author: bh
Date: 2011-10-14 15:26:29 +0200 (Fri, 14 Oct 2011)
New Revision: 5472
Modified:
base/trunk/mpulsweb/controllers/evaluation_overview.py
Log:
Fix formatting.
Modified: base/trunk/mpulsweb/controllers/evaluation_overview.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluation_overview.py 2011-10-14 10:47:35 UTC (rev 5471)
+++ base/trunk/mpulsweb/controllers/evaluation_overview.py 2011-10-14 13:26:29 UTC (rev 5472)
@@ -13,7 +13,7 @@
from mpulsweb.lib.translation import _, ungettext
from mpulsweb.model.user import UserListObject
from mpulsweb.model.agency import MpulsAgencyOverview
-from mpulsweb.model.phase import PhaseFactory
+from mpulsweb.model.phase import PhaseFactory
log = logging.getLogger(__name__)
@@ -110,7 +110,7 @@
c.userlist = ulo.getUserList(filter)
user = session['USER_AUTHORIZED']
- c.phases = PhaseFactory().build()
+ c.phases = PhaseFactory().build()
#count num of cases
c.count_agency = len([x for x in c.cases.getDatasets()])
@@ -131,7 +131,8 @@
form_defaults = search_options_copy or request.params.mixed()
session["id_field_candidate"] = "m.fkz::integer"
form_defaults["all_ids"] = " ".join(unicode(case.id)
- for case in c.cases.getDatasets() if case.id)
+ for case in c.cases.getDatasets()
+ if case.id)
session["sql_where_candidate"] = c.cases.getWhereSQL()
session.save()
return formencode.htmlfill.render(overview, defaults=form_defaults,
@@ -201,11 +202,11 @@
if action == 'no_action':
return self.no_action()
if action == 'evaluate':
- session["evaluation_ids"] = form_result.get('case_id')
+ session["evaluation_ids"] = form_result.get('case_id')
session["id_field"] = session.get("id_field_candidate")
session["sql_where"] = session.get("sql_where_candidate")
if form_result.get('all_cases') > 0:
- session["evaluation_ids"] = form_result.get('all_ids')
+ session["evaluation_ids"] = form_result.get('all_ids')
session.save()
c.url_ok = url_for(controller='/evaluation_overview')
num = len(session["evaluation_ids"])
More information about the Mpuls-commits
mailing list