projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fec4860)
common/flash.html via INCLUDE und nicht PROCESS einbinden
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 14 Sep 2017 13:45:07 +0000 (15:45 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 14 Sep 2017 13:47:56 +0000 (15:47 +0200)
flash.html überschreibt mehrere Variablen mit eigenen Werten: `title`,
`type` und `messages`. Wird das Template also mit `PROCESS`
eingebunden, so findet keine Lokalisierung statt, und die Werte aus
`flash.html` gelten dann plötzlich auch für das Template, das
`flash.html` eingebunden hat.

13 files changed:
templates/webpages/am/edit_units.html patch | blob | history
templates/webpages/client_config/form.html patch | blob | history
templates/webpages/csv_import/_deferred_report.html patch | blob | history
templates/webpages/csv_import/_deferred_results.html patch | blob | history
templates/webpages/cti/calling.html patch | blob | history
templates/webpages/drafts/form.html patch | blob | history
templates/webpages/dunning/search.html patch | blob | history
templates/webpages/employee/edit.html patch | blob | history
templates/webpages/employee/list.html patch | blob | history
templates/webpages/gl/yearend_filter.html patch | blob | history
templates/webpages/gobd/filter.html patch | blob | history
templates/webpages/ic/search.html patch | blob | history
templates/webpages/ic/search_update_prices.html patch | blob | history

diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html
index 210ec0c..00bea73 100644 (file)
--- a/templates/webpages/am/edit_units.html
+++ b/templates/webpages/am/edit_units.html
@@ -2,7 +2,7 @@
 [% USE HTML %]
 <h1>[% title %]</h1>
 
-[% PROCESS "common/flash.html" %]
+[% INCLUDE "common/flash.html" %]
 
 [% PROCESS "am/_units_header_info.html" %]
 
diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html
index 7ed61ac..df0780d 100644 (file)
--- a/templates/webpages/client_config/form.html
+++ b/templates/webpages/client_config/form.html
@@ -77,7 +77,7 @@ $(function() {
  </script>
 <h1>[% title | html %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 <form action='controller.pl' method='POST' id='form'>
  <div class="tabwidget">
diff --git a/templates/webpages/csv_import/_deferred_report.html b/templates/webpages/csv_import/_deferred_report.html
index d4fde08..2680cfe 100644 (file)
--- a/templates/webpages/csv_import/_deferred_report.html
+++ b/templates/webpages/csv_import/_deferred_report.html
@@ -1,4 +1,4 @@
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 <div id='csv_import_report'></div>
 
 <script type='text/javascript'>
@@ -26,4 +26,3 @@
 
 
 </script>
-
diff --git a/templates/webpages/csv_import/_deferred_results.html b/templates/webpages/csv_import/_deferred_results.html
index 7f68a32..f206189 100644 (file)
--- a/templates/webpages/csv_import/_deferred_results.html
+++ b/templates/webpages/csv_import/_deferred_results.html
@@ -4,7 +4,7 @@
 
 <h2>[% 'Import Status' | $T8 %]</h2>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 [% UNLESS SELF.background_job.data_as_hash.errors %]
 <div id='progress_description'></div>
 <div id='progressbar'></div>
diff --git a/templates/webpages/cti/calling.html b/templates/webpages/cti/calling.html
index 60bbcd7..d24a640 100644 (file)
--- a/templates/webpages/cti/calling.html
+++ b/templates/webpages/cti/calling.html
@@ -1,4 +1,4 @@
 <body>
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 </body>
 </html>
diff --git a/templates/webpages/drafts/form.html b/templates/webpages/drafts/form.html
index 4777a7a..1036de6 100644 (file)
--- a/templates/webpages/drafts/form.html
+++ b/templates/webpages/drafts/form.html
@@ -3,7 +3,7 @@
 [%- USE LxERP %]
 [%- USE HTML %]
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 [%- IF FORM.id %]
 <h3>[% 'Update this draft.' | $T8 %]</h3>
diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html
index b57bddb..6145f78 100644 (file)
--- a/templates/webpages/dunning/search.html
+++ b/templates/webpages/dunning/search.html
@@ -3,7 +3,7 @@
 [%- USE L %][%- USE P -%]
 <h1>[% title %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
  <form method="post" name="search" action="dn.pl" id="form">
 
diff --git a/templates/webpages/employee/edit.html b/templates/webpages/employee/edit.html
index d6ee8a0..d2da97e 100644 (file)
--- a/templates/webpages/employee/edit.html
+++ b/templates/webpages/employee/edit.html
@@ -1,6 +1,6 @@
 [%- USE LxERP -%][%- USE L -%][%- USE T8 -%]<h1>[% title | html %]</h1>
 
-[% PROCESS "common/flash.html" %]
+[% INCLUDE "common/flash.html" %]
 
 <form action="controller.pl" method="POST" id="form">
 
diff --git a/templates/webpages/employee/list.html b/templates/webpages/employee/list.html
index 056a828..483c437 100644 (file)
--- a/templates/webpages/employee/list.html
+++ b/templates/webpages/employee/list.html
@@ -1,5 +1,5 @@
 <h1>[% title | html %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 [% PROCESS 'employee/_list.html' %]
diff --git a/templates/webpages/gl/yearend_filter.html b/templates/webpages/gl/yearend_filter.html
index 1391f47..566454d 100644 (file)
--- a/templates/webpages/gl/yearend_filter.html
+++ b/templates/webpages/gl/yearend_filter.html
@@ -5,7 +5,7 @@
 
 <h1>[% title | html %]</h1>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 
 <form id='filter_form'>
 
diff --git a/templates/webpages/gobd/filter.html b/templates/webpages/gobd/filter.html
index 6d4eddd..78c0b83 100644 (file)
--- a/templates/webpages/gobd/filter.html
+++ b/templates/webpages/gobd/filter.html
@@ -5,7 +5,7 @@
 
 <h1>[% title | html %]</h1>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 
 <p>[% 'This export will include all records in the given time range and all supplicant information from checked entities. You will receive a single zip file. Please extract this file onto the data medium requested by your auditor.' | $T8 %]</p>
 
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index e4996d3..0df6802 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -4,7 +4,7 @@
 [%- USE L %]
 [%- USE P %]
 [% SET style="width: 250px" %]
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 <h1>[% title %]</h1>
 
  <form method="post" action="ic.pl" id="form">
diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html
index 1ea0f6b..ba54126 100644 (file)
--- a/templates/webpages/ic/search_update_prices.html
+++ b/templates/webpages/ic/search_update_prices.html
@@ -4,7 +4,7 @@
 [%- USE L %]
 <h1>[% 'Update prices' | $T8 %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 <form method="post" action="controller.pl" id="form">
  <table>
Unnamed repository; edit this file 'description' to name the repository.