[Mpuls-commits] r1396 - in wasko/branches/2.0/waskaweb: controllers model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-09 15:54:52 +0100 (Tue, 09 Feb 2010)
New Revision: 1396

Modified:
   wasko/branches/2.0/waskaweb/controllers/administration.py
   wasko/branches/2.0/waskaweb/model/appointment.py
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/appointment.py,
  waskaweb/model/case.py,
  waskaweb/controllers/administration.py: Import agencysettings model
  from base now.


Modified: wasko/branches/2.0/waskaweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-09 14:53:16 UTC (rev 1395)
+++ wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-09 14:54:52 UTC (rev 1396)
@@ -46,7 +46,7 @@
 from mpulsweb.lib.security import checkRole
 
 from waskaweb.model.case import CaseOverview, CaseBundle
-from waskaweb.model.agencysettings import Agency
+from mpulsweb.model.agencysettings import Agency
 
 from mpulsweb.controllers.administration import AdministrationController as BaseAdministrationController
 

Modified: wasko/branches/2.0/waskaweb/model/appointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/appointment.py	2010-02-09 14:53:16 UTC (rev 1395)
+++ wasko/branches/2.0/waskaweb/model/appointment.py	2010-02-09 14:54:52 UTC (rev 1396)
@@ -33,7 +33,7 @@
 import mpulsweb.lib.helpers as h
 from waskaweb.lib.base import session
 from mpulsweb.lib.db import db
-from waskaweb.model.agencysettings import Agency
+from mpulsweb.model.agencysettings import Agency
 from waskaweb.model.case import CaseOverview
 
 

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-09 14:53:16 UTC (rev 1395)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-09 14:54:52 UTC (rev 1396)
@@ -53,7 +53,7 @@
 #from waskaweb.lib.xmlexport import exportAsXML
 
 from mpulsweb.model.user import UserObject
-from waskaweb.model.agencysettings import Agency
+from mpulsweb.model.agencysettings import Agency
 from waskaweb.model.statement import PrivacyStatement, DiscretionStatement
 from waskaweb.model.document import listDocuments
 from waskaweb.model.phase_transition import phase_description, phase_end, \