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 d9d635b295da40abc845bee328ae6d382a3c38f4..482edc5967e1582d82c3f97bc7c541170bde2b22 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 3e757a59fd8bb13dc1fcf923487c8d80020592dd..291f6ce38d8a22871c544b6cd731f7719564722f 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 e3119913c87d8004e7dc56f32d71c539e1ae6c4b..d53dc0569ba38b9b688497eabe0656af8b6afb7b 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 57058027a2f2410597655b57b387525411568405..f9a8879c6db9d1f470e0b674c8a7ab2f9a45f75d 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 31f6f1f3edbc7ec2262c935b3a15b66e086fdf76..3de5ea38fc1a2beaf8a83e9abfcbdd1b90c7b77e 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 a534a87331aa58d420ab61527b6d4cff5f3f431c..a00d95870ec06e79bbccef4dab3687df6bde015e 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>