]> wagnertech.de Git - kivitendo-erp.git/commitdiff
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 210ec0c0afc39eb028cb8db382091acacd61f9f3..00bea73cbbd26d16b4928bbdd3d9e1a98004d743 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>
 
 [% USE HTML %]
 <h1>[% title %]</h1>
 
-[% PROCESS "common/flash.html" %]
+[% INCLUDE "common/flash.html" %]
 
 [% PROCESS "am/_units_header_info.html" %]
 
 
 [% PROCESS "am/_units_header_info.html" %]
 
diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html
index 7ed61ac516530e9ff8f1d55b4a27924af2e35830..df0780d37e98330620cd3037da51c969eea48ec6 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>
 
  </script>
 <h1>[% title | html %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 <form action='controller.pl' method='POST' id='form'>
  <div class="tabwidget">
 
 <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 d4fde088525bd3e88f08acca630a9c6cce4c0b6a..2680cfe3e6efd0e3c418b956e3f8aa1572a4fde8 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'>
 <div id='csv_import_report'></div>
 
 <script type='text/javascript'>
@@ -26,4 +26,3 @@
 
 
 </script>
 
 
 </script>
-
diff --git a/templates/webpages/csv_import/_deferred_results.html b/templates/webpages/csv_import/_deferred_results.html
index 7f68a32d50d73a381e56b3945eb1d122d129b5e7..f2061899a9423f68d2eec1f73f4f1d7f7166a8de 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>
 
 
 <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>
 [% 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 60bbcd7296dc8034827a09596183bf4af4d5ff96..d24a64027d2280c21a2ef91ba5324d5d8493ed17 100644 (file)
--- a/templates/webpages/cti/calling.html
+++ b/templates/webpages/cti/calling.html
@@ -1,4 +1,4 @@
 <body>
 <body>
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 </body>
 </html>
 </body>
 </html>
diff --git a/templates/webpages/drafts/form.html b/templates/webpages/drafts/form.html
index 4777a7a6112eeab7af085cdb6cc4c5473ca58274..1036de690ac2e206a3f0c1f5dc3b8a77ad183c8b 100644 (file)
--- a/templates/webpages/drafts/form.html
+++ b/templates/webpages/drafts/form.html
@@ -3,7 +3,7 @@
 [%- USE LxERP %]
 [%- USE HTML %]
 
 [%- USE LxERP %]
 [%- USE HTML %]
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 [%- IF FORM.id %]
 <h3>[% 'Update this draft.' | $T8 %]</h3>
 
 [%- IF FORM.id %]
 <h3>[% 'Update this draft.' | $T8 %]</h3>
diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html
index b57bddb37dd0027981b8d9e1315acda97c980b9d..6145f789db35ff3187d7f630a9c22a265d6794d4 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>
 
 [%- 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">
 
 
  <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 d6ee8a075de0a81ca3e59e6079fe071a3306da38..d2da97e9acd11edc36e3069d8dd01aa498d3a92c 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>
 
 [%- 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">
 
 
 <form action="controller.pl" method="POST" id="form">
 
diff --git a/templates/webpages/employee/list.html b/templates/webpages/employee/list.html
index 056a8281251cede45e6e7282707db65342f426f1..483c437d99f9dc7384b708cee269ab7ad0eb890a 100644 (file)
--- a/templates/webpages/employee/list.html
+++ b/templates/webpages/employee/list.html
@@ -1,5 +1,5 @@
 <h1>[% title | html %]</h1>
 
 <h1>[% title | html %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 [% PROCESS 'employee/_list.html' %]
 
 [% PROCESS 'employee/_list.html' %]
diff --git a/templates/webpages/gl/yearend_filter.html b/templates/webpages/gl/yearend_filter.html
index 1391f47ba37f6fb085d701f621be06774f2eac9a..566454db36f9a984c4f5706d5bb5b9f3a315084f 100644 (file)
--- a/templates/webpages/gl/yearend_filter.html
+++ b/templates/webpages/gl/yearend_filter.html
@@ -5,7 +5,7 @@
 
 <h1>[% title | html %]</h1>
 
 
 <h1>[% title | html %]</h1>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 
 <form id='filter_form'>
 
 
 <form id='filter_form'>
 
diff --git a/templates/webpages/gobd/filter.html b/templates/webpages/gobd/filter.html
index 6d4eddd503475755c9e94d1598b4c30ccc57a56d..78c0b83f03806f7fbd47bdcff5498aaeb692d454 100644 (file)
--- a/templates/webpages/gobd/filter.html
+++ b/templates/webpages/gobd/filter.html
@@ -5,7 +5,7 @@
 
 <h1>[% title | html %]</h1>
 
 
 <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>
 
 
 <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 e4996d363428dce241413e53fa981f0e87a42eaf..0df68022db6bac1e6f99026fd4a95c2edcc93c7f 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" %]
 [%- 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">
 <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 1ea0f6b32f7d3be1174d666c2dfaf000e40836dd..ba54126fec38827c107fe7556de60be7b7c47454 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>
 
 [%- USE L %]
 <h1>[% 'Update prices' | $T8 %]</h1>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
 
 <form method="post" action="controller.pl" id="form">
  <table>
 
 <form method="post" action="controller.pl" id="form">
  <table>
Unnamed repository; edit this file 'description' to name the repository.