[Mpuls-commits] r1461 - wasko/branches/2.0/waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-10 15:21:32 +0100 (Wed, 10 Feb 2010)
New Revision: 1461

Modified:
   wasko/branches/2.0/waskaweb/controllers/waska.py
Log:
* waskaweb/controllers/waska.py (get_newslist): Deleted.


Modified: wasko/branches/2.0/waskaweb/controllers/waska.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-10 14:21:09 UTC (rev 1460)
+++ wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-10 14:21:32 UTC (rev 1461)
@@ -32,13 +32,13 @@
 import logging
 import md5
 
-from mpulsweb.controllers.mpuls import MpulsController
+from mpulsweb.controllers.mpuls import MpulsController, get_newslist
 from mpulsweb.controllers.auth  import AuthController
 
 from waskaweb.lib.base import BaseController, c, g, h, redirect_to, render, \
      request, response, session
 from mpulsweb.lib.security import checkRole
-from waskaweb.model.news import NewsList
+from mpulsweb.model.news import NewsList
 from waskaweb.model.appointment import MaxSaveTimeReminderOverview, \
      CaseAppointmentOverview, GlobalAppointmentOverview, CaseReminderOverview
 
@@ -57,9 +57,6 @@
         remindlist.sort()
     return remindlist
 
-def get_newslist(user):
-    return NewsList(user)
-
 def get_case_appointments():
     return CaseAppointmentOverview()