From 872b2c229e0cc458298ea802b157afdb9bd9d171 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sun, 11 May 2014 00:49:01 +0200
Subject: [PATCH] Fix : delete linked resource on an element

---
 htdocs/resource/class/actions_resource.class.php | 12 +++++++++---
 htdocs/resource/element_resource.php             |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/resource/class/actions_resource.class.php b/htdocs/resource/class/actions_resource.class.php
index f41504e829d..bff2615d52f 100644
--- a/htdocs/resource/class/actions_resource.class.php
+++ b/htdocs/resource/class/actions_resource.class.php
@@ -87,11 +87,12 @@ class ActionsResource
 		    }
 
 			// Delete a resource linked to an element
-			if ($action == 'confirm_delete_resource' && $user->rights->resource->delete && GETPOST('confirm') == 'yes')
+			if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->delete && GETPOST('confirm') == 'yes')
 			{
-				$res = $object->fetch(GETPOST('lineid'));
+				$res = $object->fetch(GETPOST('id'));
 				if($res)
-				{
+				{			    
+				    
 					$result = $object->delete_resource(GETPOST('lineid'),GETPOST('element'));
 
 					if ($result >= 0)
@@ -104,6 +105,10 @@ class ActionsResource
 						setEventMessage($object->error,'errors');
 					}
 				}
+				else 
+				{
+				    setEventMessage($object->error,'errors');
+				}
 			}
 
 			// Update ressource
@@ -129,6 +134,7 @@ class ActionsResource
 					}
 				}
 			}
+			
 		}
 
 	}
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index eac32b3f502..e56074b2d1f 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -95,7 +95,7 @@ else
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
 	{
-		print $form->formconfirm("element_resource.php?element=".$element."&element_id=".$element_id."&lineid=".$lineid,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResourceElement"),"confirm_delete_resource",'','',1);
+		print $form->formconfirm("element_resource.php?element=".$element."&element_id=".$element_id."&lineid=".$lineid,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResourceElement"),"confirm_delete_linked_resource",'','',1);
 	}