From: Martin Helmling mh@waldpark.octosoft.eu <martin.helmling@octosoft.eu>
Date: Wed, 17 Feb 2016 13:55:54 +0000 (+0100)
Subject: Flash-Template Macro immer per INCLUDE dazunehmen
X-Git-Tag: release-3.4.1~413
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c01d62c4a634f27fc4560d88cf98b84af9a85d95;p=kivitendo-erp.git

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 d9d635b29..482edc596 100644
--- 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 3e757a59f..291f6ce38 100644
--- 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 e3119913c..d53dc0569 100644
--- 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 57058027a..f9a8879c6 100644
--- 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 31f6f1f3e..3de5ea38f 100644
--- 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 a534a8733..a00d95870 100644
--- 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>