From 941f50e4fbdf1ad6519e433dbe6d8aea27861577 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 8 Mar 2017 10:43:27 +0100 Subject: [PATCH 1/2] Removed obsolete calls. --- modules/taxonomy/cms_taxonomy_api.e | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/taxonomy/cms_taxonomy_api.e b/modules/taxonomy/cms_taxonomy_api.e index c28a93d..58b88c1 100644 --- a/modules/taxonomy/cms_taxonomy_api.e +++ b/modules/taxonomy/cms_taxonomy_api.e @@ -295,7 +295,7 @@ feature -- Web forms w_div.extend (w_voc_set) if voc.is_tags then - w_voc_set.extend_text ("") + w_voc_set.extend_html_text ("") -- set_legend (cms_api.translation (voc.name, Void)) create ti.make ({STRING_32} "taxonomy_" + voc.id.out) @@ -337,10 +337,10 @@ feature -- Web forms if not voc.terms.is_empty then if voc.multiple_terms_allowed then if attached voc.description as l_desc then - w_voc_set.extend_text ("") + w_voc_set.extend_html_text ("") -- w_voc_set.set_legend (cms_api.html_encoded (l_desc)) else - w_voc_set.extend_text ("") + w_voc_set.extend_html_text ("") -- w_voc_set.set_legend (cms_api.html_encoded (voc.name)) end across @@ -366,7 +366,7 @@ feature -- Web forms else w_select.set_description (cms_api.html_encoded (voc.name)) end - w_voc_set.extend_text ("") + w_voc_set.extend_html_text ("") -- w_voc_set.set_legend (cms_api.html_encoded (voc.name)) across From a9581eff011fb96eed99399aeb49e5051f9b6c5d Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 8 Mar 2017 10:46:29 +0100 Subject: [PATCH 2/2] Added support for directory output email notification. --- src/configuration/cms_default_setup.e | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/configuration/cms_default_setup.e b/src/configuration/cms_default_setup.e index f9f7dba..f84bb19 100644 --- a/src/configuration/cms_default_setup.e +++ b/src/configuration/cms_default_setup.e @@ -112,17 +112,21 @@ feature -- Access -- and file storage. if attached text_item ("mailer.output") as l_output then if l_output.is_case_insensitive_equal ("@stderr") then - f := io.error + create {NOTIFICATION_STORAGE_MAILER} l_storage_mailer.make (create {NOTIFICATION_EMAIL_FILE_STORAGE}.make (io.error)) elseif l_output.is_case_insensitive_equal ("@stdout") then - f := io.output + create {NOTIFICATION_STORAGE_MAILER} l_storage_mailer.make (create {NOTIFICATION_EMAIL_FILE_STORAGE}.make (io.output)) else create {RAW_FILE} f.make_with_name (l_output) - if not f.exists then - f.create_read_write - f.close + if f.is_directory then + create {NOTIFICATION_STORAGE_MAILER} l_storage_mailer.make (create {NOTIFICATION_EMAIL_DIRECTORY_STORAGE}.make (f.path)) + else + if not f.exists then + f.create_read_write + f.close + end + create {NOTIFICATION_STORAGE_MAILER} l_storage_mailer.make (create {NOTIFICATION_EMAIL_FILE_STORAGE}.make (f)) end end - create {NOTIFICATION_STORAGE_MAILER} l_storage_mailer.make (create {NOTIFICATION_EMAIL_FILE_STORAGE}.make (f)) if l_mailer /= Void then create l_chain.make (l_mailer) l_chain.set_next (l_storage_mailer) @@ -179,6 +183,6 @@ feature -- Element change note - copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others" + copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" end