[Mpuls-commits] r4917 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-04-15 20:41:47 +0200 (Fri, 15 Apr 2011)
New Revision: 4917

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/formularpage.py
Log:
* mpulsweb/controllers/formularpage.py: Do not import
pylons.h. Use mpulsweb.lib.helpers instead which is already being
imported here.
(FormularpageController._handle_automatic_phase_change): Adapt to
import changes.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-04-15 16:07:30 UTC (rev 4916)
+++ base/trunk/ChangeLog	2011-04-15 18:41:47 UTC (rev 4917)
@@ -1,5 +1,13 @@
 2011-04-15  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/formularpage.py: Do not import
+	pylons.h. Use mpulsweb.lib.helpers instead which is already being
+	imported here.
+	(FormularpageController._handle_automatic_phase_change): Adapt to
+	import changes.
+
+2011-04-15  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/evaluate.py (get_search_options)
 	(EvaluateController._get_evalparams): Add doc-strings.
 

Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py	2011-04-15 16:07:30 UTC (rev 4916)
+++ base/trunk/mpulsweb/controllers/formularpage.py	2011-04-15 18:41:47 UTC (rev 4917)
@@ -2,7 +2,7 @@
 
 import logging
 
-from pylons import request, c, g, h
+from pylons import request, c, g
 from pylons.controllers.util import abort, redirect_to
 from pylons.i18n.translation import get_lang
 
@@ -17,7 +17,7 @@
 from mpulsweb.lib.navigation import  mark_folderopen
 
 from mpulsweb.lib.base import BaseController, render, session
-from mpulsweb.lib.helpers import url_for
+from mpulsweb.lib.helpers import url_for, literal
 from mpulsweb.model.phase import PhaseFactory, PC_MANUAL, PC_FULLAUTO
 
 from mpulsweb.lib.formedrenderer import ViewRenderer, UrlFactory
@@ -221,8 +221,8 @@
                     case.setPhase(reachable_phase)
                     # build dialog
                     c.dialog_title = DIALOG_FULLAUTOMATIC_CHANGE_TITLE
-                    c.dialog_text = h.literal((DIALOG_FULLAUTOMATIC_CHANGE_TEXT
-                                     % (cpd, rpd)))
+                    c.dialog_text = literal((DIALOG_FULLAUTOMATIC_CHANGE_TEXT
+                                             % (cpd, rpd)))
                     c.url_ok = url_for(controller="formularpage",
                                        action="select", id=page_id)
                     return render('/phase/dialogs/success_fullautomatic_set_phase.mako')
@@ -230,8 +230,8 @@
                     log.debug("halfautomatic phase change!")
                     # build dialog
                     c.dialog_title = DIALOG_HALFAUTOMATIC_CHANGE_TITLE
-                    c.dialog_text = h.literal((DIALOG_HALFAUTOMATIC_CHANGE_TEXT
-                                     % (cpd, rpd)))
+                    c.dialog_text = literal((DIALOG_HALFAUTOMATIC_CHANGE_TEXT
+                                             % (cpd, rpd)))
                     c.url_ok = url_for(controller="phase", action="setPhase",
                                        id=session['case'].id,
                                        value=reachable_phase)