From 9ff216979ee746cfa216483016c81e77edff682c Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 14 Sep 2017 15:45:07 +0200 Subject: [PATCH] common/flash.html via INCLUDE und nicht PROCESS einbinden MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- templates/webpages/am/edit_units.html | 2 +- templates/webpages/client_config/form.html | 2 +- templates/webpages/csv_import/_deferred_report.html | 3 +-- templates/webpages/csv_import/_deferred_results.html | 2 +- templates/webpages/cti/calling.html | 2 +- templates/webpages/drafts/form.html | 2 +- templates/webpages/dunning/search.html | 2 +- templates/webpages/employee/edit.html | 2 +- templates/webpages/employee/list.html | 2 +- templates/webpages/gl/yearend_filter.html | 2 +- templates/webpages/gobd/filter.html | 2 +- templates/webpages/ic/search.html | 2 +- templates/webpages/ic/search_update_prices.html | 2 +- 13 files changed, 13 insertions(+), 14 deletions(-) diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html index 210ec0c0a..00bea73cb 100644 --- a/templates/webpages/am/edit_units.html +++ b/templates/webpages/am/edit_units.html @@ -2,7 +2,7 @@ [% USE HTML %]

[% title %]

-[% 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 7ed61ac51..df0780d37 100644 --- a/templates/webpages/client_config/form.html +++ b/templates/webpages/client_config/form.html @@ -77,7 +77,7 @@ $(function() {

[% title | html %]

-[% PROCESS 'common/flash.html' %] +[% INCLUDE 'common/flash.html' %]
diff --git a/templates/webpages/csv_import/_deferred_report.html b/templates/webpages/csv_import/_deferred_report.html index d4fde0885..2680cfe3e 100644 --- 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' %]
- diff --git a/templates/webpages/csv_import/_deferred_results.html b/templates/webpages/csv_import/_deferred_results.html index 7f68a32d5..f2061899a 100644 --- a/templates/webpages/csv_import/_deferred_results.html +++ b/templates/webpages/csv_import/_deferred_results.html @@ -4,7 +4,7 @@

[% 'Import Status' | $T8 %]

-[% PROCESS 'common/flash.html' %] +[% INCLUDE 'common/flash.html' %] [% UNLESS SELF.background_job.data_as_hash.errors %]
diff --git a/templates/webpages/cti/calling.html b/templates/webpages/cti/calling.html index 60bbcd729..d24a64027 100644 --- a/templates/webpages/cti/calling.html +++ b/templates/webpages/cti/calling.html @@ -1,4 +1,4 @@ -[% PROCESS 'common/flash.html' %] +[% INCLUDE 'common/flash.html' %] diff --git a/templates/webpages/drafts/form.html b/templates/webpages/drafts/form.html index 4777a7a61..1036de690 100644 --- 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 %]

[% 'Update this draft.' | $T8 %]

diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html index b57bddb37..6145f789d 100644 --- a/templates/webpages/dunning/search.html +++ b/templates/webpages/dunning/search.html @@ -3,7 +3,7 @@ [%- USE L %][%- USE P -%]

[% title %]

-[% PROCESS 'common/flash.html' %] +[% INCLUDE 'common/flash.html' %] diff --git a/templates/webpages/employee/edit.html b/templates/webpages/employee/edit.html index d6ee8a075..d2da97e9a 100644 --- a/templates/webpages/employee/edit.html +++ b/templates/webpages/employee/edit.html @@ -1,6 +1,6 @@ [%- USE LxERP -%][%- USE L -%][%- USE T8 -%]

[% title | html %]

-[% PROCESS "common/flash.html" %] +[% INCLUDE "common/flash.html" %] diff --git a/templates/webpages/employee/list.html b/templates/webpages/employee/list.html index 056a82812..483c437d9 100644 --- a/templates/webpages/employee/list.html +++ b/templates/webpages/employee/list.html @@ -1,5 +1,5 @@

[% title | html %]

-[% 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 1391f47ba..566454db3 100644 --- a/templates/webpages/gl/yearend_filter.html +++ b/templates/webpages/gl/yearend_filter.html @@ -5,7 +5,7 @@

[% title | html %]

-[%- PROCESS 'common/flash.html' %] +[%- INCLUDE 'common/flash.html' %] diff --git a/templates/webpages/gobd/filter.html b/templates/webpages/gobd/filter.html index 6d4eddd50..78c0b83f0 100644 --- a/templates/webpages/gobd/filter.html +++ b/templates/webpages/gobd/filter.html @@ -5,7 +5,7 @@

[% title | html %]

-[%- PROCESS 'common/flash.html' %] +[%- INCLUDE 'common/flash.html' %]

[% '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 %]

diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html index e4996d363..0df68022d 100644 --- 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' %]

[% title %]

diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html index 1ea0f6b32..ba54126fe 100644 --- a/templates/webpages/ic/search_update_prices.html +++ b/templates/webpages/ic/search_update_prices.html @@ -4,7 +4,7 @@ [%- USE L %]

[% 'Update prices' | $T8 %]

-[% PROCESS 'common/flash.html' %] +[% INCLUDE 'common/flash.html' %] -- 2.20.1