Added trash feature: Remove or revert a node.

Added Handler to show the current trash nodes for a given user.
An admin can see all the trash nodes.
Updated storage to handle trash and revert nodes.

modules/node/handler/cms_node_type_webform_manager.e

@@ -182,21 +182,28 @@ feature -- Output
 			a_response.add_variable (a_node, "node")
 			create lnk.make (a_response.translation ("View", Void), a_response.node_local_link (a_node).location)
 			lnk.set_weight (1)
-
-			a_response.add_to_primary_tabs (lnk)
-			create lnk.make ("Edit", node_api.node_path (a_node) + "/edit")
-			lnk.set_weight (2)
 			a_response.add_to_primary_tabs (lnk)
 
-			if
-				a_node /= Void and then
-				a_node.id > 0 and then
-				attached node_api.node_type_for (a_node) as l_type and then
-				node_api.has_permission_for_action_on_node ("delete", a_node, a_response.current_user (a_response.request))
-			then
-				create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
-				lnk.set_weight (3)
+			if a_node.status = {CMS_NODE_API}.trashed then
+				create lnk.make ("Trash", node_api.node_path (a_node) + "/trash")
+				lnk.set_weight (2)
 				a_response.add_to_primary_tabs (lnk)
+			else
+					-- Node in {{CMS_NODE_API}.published} or {CMS_NODE_API}.not_published} status.
+				create lnk.make ("Edit", node_api.node_path (a_node) + "/edit")
+				lnk.set_weight (2)
+				a_response.add_to_primary_tabs (lnk)
+
+				if
+					a_node /= Void and then
+					a_node.id > 0 and then
+					attached node_api.node_type_for (a_node) as l_type and then
+					node_api.has_permission_for_action_on_node ("delete", a_node, a_response.current_user (a_response.request))
+				then
+					create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
+					lnk.set_weight (3)
+					a_response.add_to_primary_tabs (lnk)
+				end
 			end
 
 			create s.make_empty

modules/node/handler/node_form_response.e

@@ -99,6 +99,29 @@ feature -- Execution
 							set_title (formatted_string (translation ("Delete $1 #$2", Void), [l_type.title, l_node.id]))
 							f.append_to_html (wsf_theme, b)
 						end
+					elseif
+						request.path_info.ends_with_general ("/trash") and then
+						node_api.has_permission_for_action_on_node ("trash", l_node, current_user (request))
+					then
+						f := new_trash_form (l_node, url (request.path_info, Void), "trash-" + l_type.name, l_type)
+						invoke_form_alter (f, fd)
+						if request.is_post_request_method then
+							f.process (Current)
+							fd := f.last_data
+						end
+						if l_node.has_id then
+							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("View", Void), node_url (l_node)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Trash", "/node/" + l_node.id.out + "/trash"), primary_tabs)
+						end
+
+						if attached redirection as l_location then
+								-- FIXME: Hack for now
+							set_title (l_node.title)
+							b.append (html_encoded (l_type.title) + " trasged")
+						else
+							set_title (formatted_string (translation ("Trash $1 #$2", Void), [l_type.title, l_node.id]))
+							f.append_to_html (wsf_theme, b)
+						end
 					else
 						b.append ("<h1>")
 						b.append (translation ("Access denied", Void))
@@ -305,6 +328,47 @@ feature -- Form
 			Result := f
 		end
 
+
+	new_trash_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_node_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
+			-- Create a web form named `a_name' for node `a_node' (if set), using form action url `a_url', and for type of node `a_node_type'.
+		local
+			f: CMS_FORM
+			ts: WSF_FORM_SUBMIT_INPUT
+		do
+			create f.make (a_url, a_name)
+
+			f.extend_html_text ("<br/>")
+			f.extend_html_text ("<legend>Are you sure you want to trash the current node?</legend>")
+			if
+				a_node /= Void and then
+				a_node.id > 0
+			then
+				create ts.make ("op")
+				ts.set_default_value ("Trash")
+				fixme ("[
+					ts.set_default_value (translation ("Trash"))
+					]")
+				f.extend (ts)
+			end
+			f.extend_html_text ("<br/>")
+			f.extend_html_text ("<legend>Do you want to revert the current node?</legend>")
+			if
+				a_node /= Void and then
+				a_node.id > 0
+			then
+				create ts.make ("op")
+				ts.set_default_value ("Revert")
+				fixme ("[
+					ts.set_default_value (translation ("Revert"))
+					]")
+				f.extend (ts)
+			end
+			Result := f
+		end
+
+
+
+
 	populate_form (a_content_type: CMS_NODE_TYPE [CMS_NODE]; a_form: WSF_FORM; a_node: detachable CMS_NODE)
 			-- Fill the web form `a_form' with data from `a_node' if set,
 			-- and apply this to content type `a_content_type'.

modules/node/handler/node_handler.e

@@ -93,6 +93,10 @@ feature -- HTTP Methods
 				check valid_url: req.path_info.starts_with_general ("/node/") end
 				create edit_response.make (req, res, api, node_api)
 				edit_response.execute
+			elseif req.path_info.ends_with_general ("/trash")  then
+				check valid_url: req.path_info.starts_with_general ("/node/") end
+				create edit_response.make (req, res, api, node_api)
+				edit_response.execute
 			else
 					-- Display existing node
 				l_nid := node_id_path_parameter (req)
@@ -129,6 +133,18 @@ feature -- HTTP Methods
 				then
 					do_delete (req, res)
 				end
+			elseif req.path_info.ends_with_general ("/trash") then
+				if
+					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
+					l_op.value.same_string ("Trash")
+				then
+					do_trash (req, res)
+				elseif
+					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
+					l_op.value.same_string ("Revert")
+				then
+					do_revert (req, res)
+				end
 			elseif req.path_info.starts_with_general ("/node/add/") then
 				create edit_response.make (req, res, api, node_api)
 				edit_response.execute
@@ -178,6 +194,62 @@ feature -- HTTP Methods
 			send_not_implemented ("REST API not yet implemented", req, res)
 		end
 
+feature {NONE} -- Trash:Revert
+
+	do_trash (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Trash a node from the database.
+		do
+			if attached current_user (req) as l_user then
+				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
+					if
+						l_id.is_integer and then
+						attached node_api.node (l_id.integer_value) as l_node
+					then
+						if node_api.has_permission_for_action_on_node ("trash", l_node, current_user (req)) then
+							node_api.trash_node (l_node)
+							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
+						else
+							send_access_denied (req, res)
+								-- send_not_authorized ?
+						end
+					else
+						do_error (req, res, l_id)
+					end
+				else
+					(create {INTERNAL_SERVER_ERROR_CMS_RESPONSE}.make (req, res, api)).execute
+				end
+			else
+				send_access_denied (req, res)
+			end
+		end
+
+	do_revert (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Revert a node: From {CMS_NODE_API}.trashed to {CMS_NODE_API}.not_published.
+		do
+			if attached current_user (req) as l_user then
+				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
+					if
+						l_id.is_integer and then
+						attached node_api.node (l_id.integer_value) as l_node
+					then
+						if node_api.has_permission_for_action_on_node ("trash", l_node, current_user (req)) then
+							node_api.revert_node (l_node)
+							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
+						else
+							send_access_denied (req, res)
+								-- send_not_authorized ?
+						end
+					else
+						do_error (req, res, l_id)
+					end
+				else
+					(create {INTERNAL_SERVER_ERROR_CMS_RESPONSE}.make (req, res, api)).execute
+				end
+			else
+				send_access_denied (req, res)
+			end
+		end
+
 feature -- Error
 
 	do_error (req: WSF_REQUEST; res: WSF_RESPONSE; a_id: detachable WSF_STRING)

modules/node/handler/trash_handler.e

@@ -0,0 +1,78 @@
+note
+	description: "Request handler related to /trash "
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	TRASH_HANDLER
+
+
+inherit
+	CMS_NODE_HANDLER
+
+	WSF_URI_HANDLER
+		rename
+			new_mapping as new_uri_mapping
+		end
+
+	WSF_RESOURCE_HANDLER_HELPER
+		redefine
+			do_get
+		end
+
+	REFACTORING_HELPER
+
+create
+	make
+
+feature -- execute
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler
+		do
+			execute_methods (req, res)
+		end
+
+feature -- HTTP Methods
+
+	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- <Precursor>
+		local
+			l_page: CMS_RESPONSE
+			s: STRING
+			n: CMS_NODE
+			lnk: CMS_LOCAL_LINK
+		do
+				-- At the moment the template is hardcoded, but we can
+				-- get them from the configuration file and load them into
+				-- the setup class.
+
+			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
+
+			if attached current_user (req) as l_user then
+
+				l_page.add_variable (node_api.trash_nodes (l_user), "nodes")
+
+					-- NOTE: for development purposes we have the following hardcode output.
+				create s.make_from_string ("<p>Nodes:</p>")
+				if attached node_api.trash_nodes (l_user) as lst then
+					s.append ("<ul class=%"cms-nodes%">%N")
+					across
+						lst as ic
+					loop
+						n := ic.item
+						lnk := node_api.node_link (n)
+						s.append ("<li class=%"cms_type_"+ n.content_type +"%">")
+						s.append (l_page.link (lnk.title, lnk.location, Void))
+						s.append ("</li>%N")
+					end
+					s.append ("</ul>%N")
+				end
+
+				l_page.set_main_content (s)
+				-- l_page.add_block (create {CMS_CONTENT_BLOCK}.make ("nodes_warning", Void, "/nodes/ is not yet fully implemented<br/>", Void), "highlighted")
+				l_page.execute
+			end
+		end
+
+end