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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-22 18:17:25 +0100 (Mon, 22 Feb 2010)
New Revision: 1679

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
Log:
* waskaweb/controllers/case.py: Rearrange imports


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-22 16:51:21 UTC (rev 1678)
+++ wasko/branches/2.0/ChangeLog	2010-02-22 17:17:25 UTC (rev 1679)
@@ -1,5 +1,9 @@
 2010-02-22  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py: Rearrange imports
+
+2010-02-22  Bernhard Herzog  <bh at intevation.de>
+
 	Move most of the CaseFactory to mpulsweb:
 
 	* mpulsweb/model/case.py (LOAD_CASE_SQL, MpulsCaseFactory): Moved

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-22 16:51:21 UTC (rev 1678)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-22 17:17:25 UTC (rev 1679)
@@ -40,22 +40,23 @@
 from paste.httpexceptions import HTTPNotFound
 
 from mpulsweb.lib.base import c, g, h, redirect_to, render, request, session
-from waskaweb.lib.base import BaseController
-
 from mpulsweb.lib.db import db
-from waskaweb.lib.search import INCONSISTENCY_CHECK_AFTER
-
 from mpulsweb.lib.navigation import get_navigation
 from mpulsweb.lib.security import checkRole
+
+from mpulsweb.model.user import UserGroupList, UserListObject
+from mpulsweb.model.appointment import CaseAppointmentFactory
+from mpulsweb.model.logbook import LogbookEntry
+
+from mpulsweb.controllers.formularpage import get_rendered_page
+
+from waskaweb.lib.base import BaseController
+from waskaweb.lib.search import INCONSISTENCY_CHECK_AFTER
 #from waskaweb.lib.xmlimport import importFromXML
 from waskaweb.lib.validators import NewCaseForm, SetStandinForm, \
      SetEditorForm, WiederaufnahmeCaseForm, \
      NeuaufnahmeCaseForm
 
-from mpulsweb.model.user import UserGroupList, UserListObject
-from mpulsweb.model.appointment import CaseAppointmentFactory
-from mpulsweb.model.logbook import LogbookEntry
-
 from waskaweb.model.statement import PrivacyStatement
 from waskaweb.model.case import Agency, SessionCase
 #from waskaweb.model.casexml import import_xml, XMLImportException
@@ -65,7 +66,6 @@
 from waskaweb.model.phase_transition import phase_symbol, phase_start, \
      PHASE_DESCRIPTIONS, CLEAR_START, CLEAR_ENDE, CM_ENDE, NB_ENDE
 
-from mpulsweb.controllers.formularpage import get_rendered_page
 from waskaweb.controllers.caselifetime import DataSaveException
 
 from waskaweb.converter.wasko_v1v2 import WaskoV1V2