[Mpuls-commits] r1313 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-08 12:44:35 +0100 (Mon, 08 Feb 2010)
New Revision: 1313

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/phase.py
Log:
* waskaweb/controllers/phase.py: Expand star imports.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-08 11:44:13 UTC (rev 1312)
+++ wasko/branches/2.0/ChangeLog	2010-02-08 11:44:35 UTC (rev 1313)
@@ -1,5 +1,9 @@
 2010-02-08  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/phase.py: Expand star imports.
+
+2010-02-08  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/template.py: Expand star imports.
 
 2010-02-08  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/phase.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/phase.py	2010-02-08 11:44:13 UTC (rev 1312)
+++ wasko/branches/2.0/waskaweb/controllers/phase.py	2010-02-08 11:44:35 UTC (rev 1313)
@@ -2,10 +2,12 @@
 import logging
 
 from pylons import session, g, c
-from waskaweb.lib.base import *
+
 from mpulsweb.lib.security import checkRole
-from waskaweb.model.phase import PhaseFactory 
 
+from waskaweb.lib.base import BaseController, h, render, request
+from waskaweb.model.phase import PhaseFactory
+
 SET_PHASE_NOTIFICATION_SUCCESS = u"""Phase gewechselt!"""
 SET_PHASE_NOTIFICATION_TEXT_SUCCESS= u"""\
 Die Phase konnte erfolgreich gewechselt werden. Bitte folgen Sie den