[Mpuls-commits] r4191 - in base/trunk: . mpulsweb/templates/evaluation

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-11-16 11:47:01 +0100 (Tue, 16 Nov 2010)
New Revision: 4191

Added:
   base/trunk/mpulsweb/templates/evaluation/evaluate_extra.mako
Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/evaluation/evaluate.mako
Log:
The last part of the base changes for mpuls/issue1264

* mpulsweb/templates/evaluation/evaluate.mako: Include the new
evaluate_extra.mako template.

* mpulsweb/templates/evaluation/evaluate_extra.mako: New.
Basically empty template that can be used by derived applications
to add new search criteria to the evaluation form.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-11-16 10:37:21 UTC (rev 4190)
+++ base/trunk/ChangeLog	2010-11-16 10:47:01 UTC (rev 4191)
@@ -1,5 +1,16 @@
 2010-11-16  Bernhard Herzog  <bh at intevation.de>
 
+	The last part of the base changes for mpuls/issue1264
+
+	* mpulsweb/templates/evaluation/evaluate_extra.mako: New.
+	Basically empty template that can be used by derived applications
+	to add new search criteria to the evaluation form.
+
+	* mpulsweb/templates/evaluation/evaluate.mako: Include the new
+	evaluate_extra.mako template.
+
+2010-11-16  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/evaluate.py
 	(EvaluateController.type_ending_clause): New.  Method to be
 	implemented by derived classes for searches based on the type of

Modified: base/trunk/mpulsweb/templates/evaluation/evaluate.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/evaluate.mako	2010-11-16 10:37:21 UTC (rev 4190)
+++ base/trunk/mpulsweb/templates/evaluation/evaluate.mako	2010-11-16 10:47:01 UTC (rev 4191)
@@ -56,6 +56,8 @@
       <form:error name="end_date" format="">
     </td>
   </tr>
+  <%include file="/evaluation/evaluate_extra.mako" 
+            args="adele_disabled=adele_disabled"/>
   <%
      evaluation_ids = session.get("evaluation_ids")
    %>

Added: base/trunk/mpulsweb/templates/evaluation/evaluate_extra.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/evaluate_extra.mako	2010-11-16 10:37:21 UTC (rev 4190)
+++ base/trunk/mpulsweb/templates/evaluation/evaluate_extra.mako	2010-11-16 10:47:01 UTC (rev 4191)
@@ -0,0 +1,4 @@
+## Define this template in derived mpuls application to add extra case
+## search options to the evaluation form
+## The evaluate_extra template must accept one argument, adele_disabled.
+<%page args="adele_disabled"/>