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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-05 16:27:40 +0100 (Fri, 05 Feb 2010)
New Revision: 1285

Modified:
   wasko/branches/2.0/waskaweb/controllers/waska.py
Log:
* waskaweb/controllers/waska.py (WaskaController.markNewsAsRead):
Deleted. Functionality is moved to news controller in base (hide
method)


Modified: wasko/branches/2.0/waskaweb/controllers/waska.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-05 15:22:15 UTC (rev 1284)
+++ wasko/branches/2.0/waskaweb/controllers/waska.py	2010-02-05 15:27:40 UTC (rev 1285)
@@ -38,7 +38,6 @@
 from waskaweb.lib.base import BaseController, c, g, h, redirect_to, render, \
      request, response, session
 from mpulsweb.lib.security import checkRole
-from mpulsweb.model.user import UserObject
 from waskaweb.model.news import NewsList
 from waskaweb.model.appointment import MaxSaveTimeReminderOverview, \
      CaseAppointmentOverview, GlobalAppointmentOverview, CaseReminderOverview
@@ -104,24 +103,6 @@
             c.news = get_newslist(user)
         return render('/start/start.mako')
 
-    def markNewsAsRead(self, id, confirmed=0):
-        id = self._checkInt(id)
-        confirmed = self._checkBool(confirmed)
-        session_user = session['USER_AUTHORIZED']
-        try:
-            if confirmed == 1:
-                user = UserObject(session_user.id)
-                user.setNewsAsRead(id)
-                return self.start()
-            else:
-                c.confirm_for = MARK_NEWS_AS_READ_CONFIRM
-                c.question = MARK_NEWS_AS_READ_CONFIRM_TEXT
-                c.url_yes = "/waska/markNewsAsRead/%s/1" % id
-                c.url_no = "/waska"
-                return render('/start/dialogs/confirm_mark_news_as_read.mako')
-        except:
-            return render('/tests/trace.mako')
-
     def help(self):
         return render('/start/help.mako')