Flash-Template Macro immer per INCLUDE dazunehmen

Bei PROCESS bleiben Macro variable "typ", "title" und "message" für den Rest
des Templates gesetzt, bzw überschreiben gesetzte Template Variable,

aufgefallen z.B in ic/form_header.html :
Dort gibt es die HIDDEN Variable "title",
die dann vom Macro beim letzen Durchlauf auf Ok bzw (Übersetzung von Ok) gesetzt wird

Es gibt noch ein paar mehr template files (7), in denen PROCESS verwendet wird,
ob es dort Auswirkungen hat ist noch zu prüfen

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index d9d635b..482edc5 100644 (file)
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -4,7 +4,7 @@
 [% PROCESS 'common/select_warehouse_bin.html' %]
  <h1>[% title %]  [% HTML.escape(partnumber) %]  [% HTML.escape(description) %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
  <form method="post" name="ic" action="[% script %]">
 

diff --git a/templates/webpages/ic/generate_report_top.html b/templates/webpages/ic/generate_report_top.html
index 3e757a5..291f6ce 100644 (file)
--- a/templates/webpages/ic/generate_report_top.html
+++ b/templates/webpages/ic/generate_report_top.html
@@ -1,6 +1,6 @@
 [%- USE HTML %]
 [%- USE T8 %]
 [%- USE L %]
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 
 [% 'Options' | $T8 %]: [% options.join(', ') %]

diff --git a/templates/webpages/inventory/warehouse_selection_stock.html b/templates/webpages/inventory/warehouse_selection_stock.html
index e311991..d53dc05 100644 (file)
--- a/templates/webpages/inventory/warehouse_selection_stock.html
+++ b/templates/webpages/inventory/warehouse_selection_stock.html
@@ -5,7 +5,7 @@
 
 <h1>[% title | html %]</h1>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 
 <form name="Form" method="post" action="controller.pl">
 

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 5705802..f9a8879 100644 (file)
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -25,7 +25,7 @@
 
 <p>[% saved_message %]</p>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 [%- INCLUDE 'generic/set_longdescription.html' %]
 
 <div id="is_tabs" class="tabwidget">

diff --git a/templates/webpages/letter/edit.html b/templates/webpages/letter/edit.html
index 31f6f1f..3de5ea3 100644 (file)
--- a/templates/webpages/letter/edit.html
+++ b/templates/webpages/letter/edit.html
@@ -10,7 +10,7 @@
   <input type="hidden" name="draft.id" value="[% draft.id | html %]">
   <input type="hidden" name="type" value="[% type | html %]">
 
-  [%- PROCESS 'common/flash.html' %]
+  [%- INCLUDE 'common/flash.html' %]
 
   <div id="oe_tabs" class="tabwidget">
    <ul>

diff --git a/templates/webpages/price_rule/report_top.html b/templates/webpages/price_rule/report_top.html
index a534a87..a00d958 100644 (file)
--- a/templates/webpages/price_rule/report_top.html
+++ b/templates/webpages/price_rule/report_top.html
@@ -1,4 +1,4 @@
 [%- USE L %]
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 [%- PROCESS 'price_rule/_filter.html' filter=SELF.models.filtered.laundered UNLESS FORM.inline %]
  <hr>