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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-10 17:37:59 +0100 (Wed, 10 Feb 2010)
New Revision: 1477

Modified:
   wasko/branches/2.0/waskaweb/controllers/waska.py
Log:
* waskaweb/controllers/waska.py (get_global_appointments): Deleted. Import from mpulsweb now.


Modified: wasko/branches/2.0/waskaweb/controllers/waska.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-10 16:36:32 UTC (rev 1476)
+++ wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-10 16:37:59 UTC (rev 1477)
@@ -32,7 +32,8 @@
 import logging
 import md5
 
-from mpulsweb.controllers.mpuls import MpulsController, get_newslist
+from mpulsweb.controllers.mpuls import MpulsController, get_newslist, \
+    get_global_appointments
 from mpulsweb.controllers.auth  import AuthController
 
 from waskaweb.lib.base import BaseController, c, g, h, redirect_to, render, \
@@ -59,10 +60,6 @@
 def get_case_appointments():
     return CaseAppointmentOverview()
 
-def get_global_appointments():
-    return GlobalAppointmentOverview()
-
-
 MARK_NEWS_AS_READ_CONFIRM = u"""Nachricht als gelesen markieren"""
 MARK_NEWS_AS_READ_CONFIRM_TEXT = u"""\
 Wollen Sie die Nachricht wirklich als gelesen markieren?