Added precondition to NODE_FORM_RESPONSE.new_delete_form

Added transaction support to CMS_NODE_STORAGE_SQL.delete_node_base

modules/node/handler/node_form_response.e

@@ -173,6 +173,7 @@ feature {NONE} -- Create a new node
 			f: like new_edit_form
 			fd: detachable WSF_FORM_DATA
 		do
+			if a_node.is_trashed then
 				f := new_delete_form (a_node, url (location, Void), "delete-" + a_type.name, a_type)
 				hooks.invoke_form_alter (f, fd, Current)
 				if request.is_post_request_method then
@@ -193,6 +194,9 @@ feature {NONE} -- Create a new node
 					set_title (formatted_string (translation ("Delete $1 #$2", Void), [a_type.title, a_node.id]))
 					f.append_to_html (wsf_theme, b)
 				end
+			else
+				--
+			end
 		end
 
 
@@ -355,6 +359,8 @@ feature -- Form
 
 	new_delete_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'.
+		require
+				is_trashed: attached a_node as l_node and then a_node.is_trashed
 		local
 			f: CMS_FORM
 			ts: WSF_FORM_SUBMIT_INPUT
@@ -375,8 +381,11 @@ feature -- Form
 					ts.set_default_value (translation ("Delete"))
 					]")
 				f.extend (ts)
-				to_implement ("Refactor code to use the new wsf_html HTML5 support")
+				create ts.make ("op")
-				f.extend_html_text("<input type='submit' value='Cancel' formmethod='GET', formaction='/node/"+a_node.id.out+"'>" )
+				ts.set_default_value ("Cancel")
+				ts.set_formaction ("/node/"+a_node.id.out)
+				ts.set_formmethod ("GET")
+				f.extend (ts)
 			end
 			f.extend_html_text ("<br/>")
 			f.extend_html_text ("<legend>Do you want to restore the current node?</legend>")

modules/node/persistence/cms_node_storage_sql.e

@@ -385,6 +385,7 @@ feature -- Change: Node
 			l_time: DATE_TIME
 			l_sql_delete_node_aliases: STRING
 		do
+			sql_begin_transaction
 			create l_time.make_now_utc
 			write_information_log (generator + ".delete_node_base {" + a_node.id.out + "}")
 
@@ -408,6 +409,9 @@ feature -- Change: Node
 
 			if not error_handler.has_error then
 				extended_delete (a_node)
+				sql_commit_transaction
+			else
+				sql_rollback_transaction
 			end
 		end