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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-05 15:51:51 +0100 (Fri, 05 Feb 2010)
New Revision: 1279

Modified:
   wasko/branches/2.0/waskaweb/controllers/administration.py
   wasko/branches/2.0/waskaweb/controllers/case.py
   wasko/branches/2.0/waskaweb/controllers/case_overview.py
   wasko/branches/2.0/waskaweb/controllers/usersettings.py
   wasko/branches/2.0/waskaweb/controllers/waska.py
   wasko/branches/2.0/waskaweb/model/case.py
Log:


Modified: wasko/branches/2.0/waskaweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-05 14:46:28 UTC (rev 1278)
+++ wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-05 14:51:51 UTC (rev 1279)
@@ -36,7 +36,7 @@
 from waskaweb.lib.base             import *
 from mpulsweb.lib.security         import getDbName 
 from waskaweb.lib.validators       import ValidatorStateObject, NewUserForm, EditUserForm, NewPasswordForm, EditSettingsForm, DeleteUserHelperForm, NewUserGroupForm, EditUserGroupForm
-from waskaweb.model.user           import UserObject, UserListObject, UserGroup, UserGroupList, UserGroupFactory
+from mpulsweb.model.user           import UserObject, UserListObject, UserGroup, UserGroupList, UserGroupFactory
 from waskaweb.model.case           import CaseOverview, CaseBundle 
 from waskaweb.model.agencysettings import Agency
 from mpulsweb.lib.security         import checkRole

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-05 14:46:28 UTC (rev 1278)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-05 14:51:51 UTC (rev 1279)
@@ -51,7 +51,7 @@
      SetEditorForm, WiederaufnahmeCaseForm, \
      NeuaufnahmeCaseForm
 
-from waskaweb.model.user import UserGroupList, UserListObject
+from mpulsweb.model.user import UserGroupList, UserListObject
 
 from waskaweb.model.statement import PrivacyStatement
 

Modified: wasko/branches/2.0/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case_overview.py	2010-02-05 14:46:28 UTC (rev 1278)
+++ wasko/branches/2.0/waskaweb/controllers/case_overview.py	2010-02-05 14:51:51 UTC (rev 1279)
@@ -44,7 +44,7 @@
 from waskaweb.lib.exportselection import CasePartsSelection
 
 from waskaweb.model.case import CaseOverview, CaseBundle
-from waskaweb.model.user import UserListObject, UserObject, UserGroupList
+from mpulsweb.model.user import UserListObject, UserObject, UserGroupList
 
 from waskaweb.controllers.CaseBase import CasebaseController
 

Modified: wasko/branches/2.0/waskaweb/controllers/usersettings.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/usersettings.py	2010-02-05 14:46:28 UTC (rev 1278)
+++ wasko/branches/2.0/waskaweb/controllers/usersettings.py	2010-02-05 14:51:51 UTC (rev 1279)
@@ -37,7 +37,7 @@
 from waskaweb.lib.validators import BaseFormValidator, NewPasswordForm
 from mpulsweb.lib.security import checkRole
 
-from waskaweb.model.user import UserListObject, UserObject, UserGroupList, \
+from mpulsweb.model.user import UserListObject, UserObject, UserGroupList, \
      UserGroup
 
 

Modified: wasko/branches/2.0/waskaweb/controllers/waska.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-05 14:46:28 UTC (rev 1278)
+++ wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-05 14:51:51 UTC (rev 1279)
@@ -38,7 +38,7 @@
 from waskaweb.lib.base import BaseController, c, g, h, redirect_to, render, \
      request, response, session
 from mpulsweb.lib.security import checkRole
-from waskaweb.model.user import UserObject
+from mpulsweb.model.user import UserObject
 from waskaweb.model.news import NewsList
 from waskaweb.model.appointment import MaxSaveTimeReminderOverview, \
      CaseAppointmentOverview, GlobalAppointmentOverview, CaseReminderOverview

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-05 14:46:28 UTC (rev 1278)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-05 14:51:51 UTC (rev 1279)
@@ -52,7 +52,7 @@
 #from waskaweb.lib.excel import exportAsXLS
 #from waskaweb.lib.xmlexport import exportAsXML
 
-from waskaweb.model.user import UserObject
+from mpulsweb.model.user import UserObject
 from waskaweb.model.agencysettings import Agency
 from waskaweb.model.statement import PrivacyStatement, DiscretionStatement
 from waskaweb.model.document import listDocuments