Improved node management.

- List node by node types - fixed the trash/restore/delete workflow Added messaging module to send message to cms users (by email for now). Added early protection for cache, export and import functionalities.
2017-02-28 11:24:48 +01:00
parent dc84e79952
commit a341bd98eb
35 changed files with 1055 additions and 212 deletions
--- a/modules/admin/handler/cms_admin_cache_handler.e
+++ b/modules/admin/handler/cms_admin_cache_handler.e
@@ -41,11 +41,15 @@ feature -- Execution
 			s: STRING
 			f: CMS_FORM
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			f := clear_cache_web_form (l_response)
-			create s.make_empty
-			f.append_to_html (l_response.wsf_theme, s)
-			l_response.set_main_content (s)
+			if api.has_permission ("admin cache") then
+				create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+				f := clear_cache_web_form (l_response)
+				create s.make_empty
+				f.append_to_html (l_response.wsf_theme, s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
+			end
 			l_response.execute
 		end

@@ -55,23 +59,27 @@ feature -- Execution
 			s: STRING
 			f: CMS_FORM
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			f := clear_cache_web_form (l_response)
-			f.process (l_response)
-			if
-				attached f.last_data as fd and then
-				fd.is_valid
-			then
-				if attached fd.string_item ("op") as l_op and then l_op.same_string (text_clear_all_caches) then
-					api.hooks.invoke_clear_cache (Void, l_response)
-					l_response.add_notice_message ("Caches cleared (if allowed)!")
-				else
-					fd.report_error ("Invalid form data!")
+			if api.has_permission ("admin cache") then
+				create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+				f := clear_cache_web_form (l_response)
+				f.process (l_response)
+				if
+					attached f.last_data as fd and then
+					fd.is_valid
+				then
+					if attached fd.string_item ("op") as l_op and then l_op.same_string (text_clear_all_caches) then
+						api.hooks.invoke_clear_cache (Void, l_response)
+						l_response.add_notice_message ("Caches cleared (if allowed)!")
+					else
+						fd.report_error ("Invalid form data!")
+					end
 				end
+				create s.make_empty
+				f.append_to_html (l_response.wsf_theme, s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
 			end
-			create s.make_empty
-			f.append_to_html (l_response.wsf_theme, s)
-			l_response.set_main_content (s)
 			l_response.execute
 		end

--- a/modules/admin/handler/cms_admin_export_handler.e
+++ b/modules/admin/handler/cms_admin_export_handler.e
@@ -41,11 +41,15 @@ feature -- Execution
 			s: STRING
 			f: CMS_FORM
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			f := exportation_web_form (l_response)
-			create s.make_empty
-			f.append_to_html (l_response.wsf_theme, s)
-			l_response.set_main_content (s)
+			if api.has_permission ("admin export") then
+				create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+				f := exportation_web_form (l_response)
+				create s.make_empty
+				f.append_to_html (l_response.wsf_theme, s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
+			end
 			l_response.execute
 		end

@@ -56,37 +60,41 @@ feature -- Execution
 			f: CMS_FORM
 			l_exportation: CMS_EXPORT_CONTEXT
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			f := exportation_web_form (l_response)
-			f.process (l_response)
-			if
-				attached f.last_data as fd and then
-				fd.is_valid
-			then
-				if attached fd.string_item ("op") as l_op and then l_op.same_string (text_export_all_data) then
-					if attached fd.string_item ("folder") as l_folder then
-						create l_exportation.make (api.site_location.extended ("export").extended (l_folder))
+			if api.has_permission ("admin export") then
+				create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+				f := exportation_web_form (l_response)
+				f.process (l_response)
+				if
+					attached f.last_data as fd and then
+					fd.is_valid
+				then
+					if attached fd.string_item ("op") as l_op and then l_op.same_string (text_export_all_data) then
+						if attached fd.string_item ("folder") as l_folder then
+							create l_exportation.make (api.site_location.extended ("export").extended (l_folder))
+						else
+							create l_exportation.make (api.site_location.extended ("export").extended ((create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd---hh24-[0]mi-[0]ss")))
+						end
+						api.hooks.invoke_export_to (Void, l_exportation, l_response)
+						l_response.add_notice_message ("All data exported (if allowed)!")
+						create s.make_empty
+						across
+							l_exportation.logs as ic
+						loop
+							s.append (ic.item)
+							s.append ("<br/>")
+							s.append_character ('%N')
+						end
+						l_response.add_notice_message (s)
 					else
-						create l_exportation.make (api.site_location.extended ("export").extended ((create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd---hh24-[0]mi-[0]ss")))
+						fd.report_error ("Invalid form data!")
 					end
-					api.hooks.invoke_export_to (Void, l_exportation, l_response)
-					l_response.add_notice_message ("All data exported (if allowed)!")
-					create s.make_empty
-					across
-						l_exportation.logs as ic
-					loop
-						s.append (ic.item)
-						s.append ("<br/>")
-						s.append_character ('%N')
-					end
-					l_response.add_notice_message (s)
-				else
-					fd.report_error ("Invalid form data!")
 				end
+				create s.make_empty
+				f.append_to_html (l_response.wsf_theme, s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
 			end
-			create s.make_empty
-			f.append_to_html (l_response.wsf_theme, s)
-			l_response.set_main_content (s)
 			l_response.execute
 		end

--- a/modules/admin/handler/cms_admin_import_handler.e
+++ b/modules/admin/handler/cms_admin_import_handler.e
@@ -41,11 +41,15 @@ feature -- Execution
 			s: STRING
 			f: CMS_FORM
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			f := importation_web_form (l_response)
-			create s.make_empty
-			f.append_to_html (l_response.wsf_theme, s)
-			l_response.set_main_content (s)
+			if api.has_permission ("admin import") then
+				create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+				f := importation_web_form (l_response)
+				create s.make_empty
+				f.append_to_html (l_response.wsf_theme, s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
+			end
 			l_response.execute
 		end

@@ -57,43 +61,48 @@ feature -- Execution
 			l_importation: CMS_IMPORT_CONTEXT
 			p: PATH
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			f := importation_web_form (l_response)
-			f.process (l_response)
-			if
-				attached f.last_data as fd and then
-				fd.is_valid
-			then
-				if attached fd.string_item ("op") as l_op and then l_op.same_string (text_import_all_data) then
-					if attached fd.string_item ("folder") as l_folder then
-						create p.make_from_string (l_folder)
-						create l_importation.make (api.site_location.extended (import_folder_name).extended (l_folder))
-						if l_importation.location_exists then
-							l_response.add_notice_message ("Import all data (if permitted)!")
-							api.hooks.invoke_import_from (Void, l_importation, l_response)
-							create s.make_empty
-							across
-								l_importation.logs as ic
-							loop
-								s.append (ic.item)
-								s.append ("<br/>")
-								s.append_character ('%N')
+			if api.has_permission ("admin import") then
+				create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+				f := importation_web_form (l_response)
+				f.process (l_response)
+				if
+					attached f.last_data as fd and then
+					fd.is_valid
+				then
+					if attached fd.string_item ("op") as l_op and then l_op.same_string (text_import_all_data) then
+						if attached fd.string_item ("folder") as l_folder then
+							create p.make_from_string (l_folder)
+							create l_importation.make (api.site_location.extended (import_folder_name).extended (l_folder))
+							if l_importation.location_exists then
+								l_response.add_notice_message ("Import all data (if permitted)!")
+								api.hooks.invoke_import_from (Void, l_importation, l_response)
+								create s.make_empty
+								across
+									l_importation.logs as ic
+								loop
+									s.append (ic.item)
+									s.append ("<br/>")
+									s.append_character ('%N')
+								end
+								l_response.add_notice_message (s)
+							else
+								l_response.add_error_message ("Specified import folder is not found!")
+								fd.report_invalid_field ("folder", "Folder not found!")
 							end
-							l_response.add_notice_message (s)
 						else
-							l_response.add_error_message ("Specified import folder is not found!")
-							fd.report_invalid_field ("folder", "Folder not found!")
+							fd.report_error ("Invalid form data!")
 						end
 					else
 						fd.report_error ("Invalid form data!")
 					end
-				else
-					fd.report_error ("Invalid form data!")
 				end
+				create s.make_empty
+				f.append_to_html (l_response.wsf_theme, s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
 			end
-			create s.make_empty
-			f.append_to_html (l_response.wsf_theme, s)
-			l_response.set_main_content (s)
+
 			l_response.execute
 		end

--- a/modules/admin/handler/user/cms_admin_users_handler.e
+++ b/modules/admin/handler/user/cms_admin_users_handler.e
@@ -66,6 +66,7 @@ feature -- HTTP Methods
 			s_pager: STRING
 			l_count: INTEGER
 			user_api: CMS_USER_API
+			l_display_name: READABLE_STRING_32
 		do
 				-- At the moment the template are hardcoded, but we can
 				-- get them from the configuration file and load them into
@@ -81,9 +82,9 @@ feature -- HTTP Methods

 				create s.make_empty
 				if l_count > 1 then
-					l_response.set_title ("Listing " + l_count.out + " Users")
+					l_response.set_title ("Listing " + l_count.out + " users")
 				else
-					l_response.set_title ("Listing " + l_count.out + " User")
+					l_response.set_title ("A single user")
 				end

 				create s_pager.make_empty
@@ -106,7 +107,13 @@ feature -- HTTP Methods
 						s.append ("<a href=%"")
 						s.append (req.absolute_script_url ("/admin/user/"+u.id.out))
 						s.append ("%">")
-						s.append (html_encoded (u.name))
+						l_display_name := user_api.user_display_name (u)
+						s.append (html_encoded (l_display_name))
+						if not l_display_name.same_string (u.name) then
+							s.append (" [")
+							s.append (html_encoded (u.name))
+							s.append ("]")
+						end
 						s.append ("</a>")
 						if attached user_api.user_roles (u) as l_roles and then not l_roles.is_empty then
 							s.append (" <span class=%"cms_roles%">(")