[Mpuls-commits] r1853 - in wasko/branches/2.0/mpulsweb: controllers templates/privacy/dialogs

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-26 16:11:31 +0100 (Fri, 26 Feb 2010)
New Revision: 1853

Added:
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accept_success.mako
Removed:
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako
Modified:
   wasko/branches/2.0/mpulsweb/controllers/privacy.py
Log:
Fixed located and names of templates


Modified: wasko/branches/2.0/mpulsweb/controllers/privacy.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/privacy.py	2010-02-26 15:07:20 UTC (rev 1852)
+++ wasko/branches/2.0/mpulsweb/controllers/privacy.py	2010-02-26 15:11:31 UTC (rev 1853)
@@ -5,7 +5,7 @@
 from pylons import app_globals as g
 
 from mpulsweb.lib.security import checkRole
-from mpulsweb.lib.base import BaseController, render, c, h
+from mpulsweb.lib.base import BaseController, render, c, h, session
 from mpulsweb.lib.anonymize import determineAnonymizedCaseEndPhase
 
 from mpulsweb.controllers.case import ANONYMIZE_CONFIRM, \
@@ -73,8 +73,8 @@
         else:
             c.dialog_title = HEADER
             c.dialog_text = ACCEPT_QUESTION
-            c.url_yes = h.url_for(controller="statement",
-                                  action="acceptPrivacyStatement",
+            c.url_yes = h.url_for(controller="privacy",
+                                  action="accept",
                                   id=id, confirmed="1")
             c.url_no = h.url_for(controller="/case", action="select",
                                  id=id, confirmed=0)

Deleted: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako	2010-02-26 15:07:20 UTC (rev 1852)
+++ wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako	2010-02-26 15:11:31 UTC (rev 1853)
@@ -1,8 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../../casemanagement/main.mako"/>
-<%def name="buildNavipath()">
-  ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
-</%def>
-<%include file="../../dialogs/success.mako" />

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accept_success.mako (from rev 1848, wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako)