From 12aafd219da9ea16a7ab8b95c668d0125dd74de1 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sun, 11 May 2014 10:19:38 +0200
Subject: [PATCH] Fix : update linked resource

---
 htdocs/core/tpl/resource_view.tpl.php            |  2 +-
 htdocs/resource/class/actions_resource.class.php | 10 +++++-----
 htdocs/resource/class/resource.class.php         |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 6f4d80ed84f..ef2963b28c1 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -49,7 +49,7 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			print '<form class="tagtr '.($var==true?'pair':'impair').'" action="'.$_SERVER["PHP_SELF"].'?element='.$element.'&element_id='.$element_id.'" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 			print '<input type="hidden" name="id" value="'.$object->id.'" />';
-			print '<input type="hidden" name="action" value="update_resource" />';
+			print '<input type="hidden" name="action" value="update_linked_resource" />';
 			print '<input type="hidden" name="resource_type" value="'.$resource_type.'" />';
 			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
 
diff --git a/htdocs/resource/class/actions_resource.class.php b/htdocs/resource/class/actions_resource.class.php
index bff2615d52f..d4f7050972d 100644
--- a/htdocs/resource/class/actions_resource.class.php
+++ b/htdocs/resource/class/actions_resource.class.php
@@ -112,16 +112,16 @@ class ActionsResource
 			}
 
 			// Update ressource
-			if ($action == 'update_resource' && $user->rights->resource->write && !GETPOST('cancel') )
+			if ($action == 'update_linked_resource' && $user->rights->resource->write && !GETPOST('cancel') )
 			{
-				$res = $object->fetch(GETPOST('lineid'));
+				$res = $object->fetch_element_resource(GETPOST('lineid'));
 				if($res)
 				{
-					$object->id = GETPOST('lineid');
+					
 					$object->busy = GETPOST('busy');
 					$object->mandatory = GETPOST('mandatory');
-
-					$result = $object->update();
+					
+					$result = $object->update_element_resource($user);
 
 					if ($result >= 0)
 					{
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index 126ffd2e5b8..09e4886779d 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -303,9 +303,9 @@ class Resource extends CommonObject
     			$this->fk_user_create	=	$obj->fk_user_create;
 
 				if($obj->resource_id && $obj->resource_type)
-					$this->objresource = $this->fetchObjectByElement($obj->resource_id,$obj->resource_type);
+					$this->objresource = fetchObjectByElement($obj->resource_id,$obj->resource_type);
 				if($obj->element_id && $obj->element_type)
-					$this->objelement = $this->fetchObjectByElement($obj->element_id,$obj->element_type);
+					$this->objelement = fetchObjectByElement($obj->element_id,$obj->element_type);
 
     		}
     		$this->db->free($resql);