[Mpuls-commits] r2181 - in wasko/branches/2.0: jmdweb/templates/casemanagement/dialogs mpulsweb/controllers mpulsweb/templates/casemanagement/dialogs

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-25 14:29:19 +0100 (Thu, 25 Mar 2010)
New Revision: 2181

Added:
   wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
Removed:
   wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/delete_attachment_success.mako
Modified:
   wasko/branches/2.0/mpulsweb/controllers/casedocument.py
Log:
Moved (and renamed) success dialog after deleting an attachment into mpulsbase. Adapt
controller to load renamed template file


Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/delete_attachment_success.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/delete_attachment_success.mako	2010-03-25 13:26:43 UTC (rev 2180)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/delete_attachment_success.mako	2010-03-25 13:29:19 UTC (rev 2181)
@@ -1,10 +0,0 @@
-<%inherit file="../../main.mako" />
-<%def name="buildNavipath()">
-	${parent.buildNavipath()}
-        <li><a href="/case">${_('cm_np_root')}</a></li>
-        <li><a href="/case/case_overview">${_('cm_np_overview')}</a></li>
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
-	<li><a href="#">${_('cm_np_delete_attachment_success')}</a></li>
-</%def>
-<%include file="../../dialogs/success.mako" />

Modified: wasko/branches/2.0/mpulsweb/controllers/casedocument.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/casedocument.py	2010-03-25 13:26:43 UTC (rev 2180)
+++ wasko/branches/2.0/mpulsweb/controllers/casedocument.py	2010-03-25 13:29:19 UTC (rev 2181)
@@ -105,7 +105,7 @@
                                  id=session['case'].id)
             c.success_for = SET_ATTACHMENT_SUCCESS_DELETE_HEADER
             c.success_text = SET_ATTACHMENT_SUCCESS_DELETE_TEXT
-            return render('/casemanagement/dialogs/delete_attachment_success.mako',
+            return render('/casemanagement/dialogs/success_delete_attachment.mako',
                           id=session['case'].id)
         else:
             c.context = "../main.mako"

Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako (from rev 2178, wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/delete_attachment_success.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
___________________________________________________________________
Name: svn:mergeinfo
   +