lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "REST API: fix deleting a product/service."

Browse Source 
This reverts commit d7c8a466b1.
This commit is contained in:
Xebax 2016-06-21 22:54:38 +02:00
parent 3cac54741d
commit 4a0d554986
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/card.php
View File

@ -553,7 +553,7 @@ if (empty($reshook))
{
if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
{
$result = $object->delete($user);
$result = $object->delete($object->id);
}
if ($result > 0)

3
htdocs/product/class/api_products.class.php
View File

@ -232,6 +232,7 @@ class Products extends DolibarrApi
*
* @param int $id Product ID
* @return array
* FIXME Deleting a product/service does not work because the Product::delete() method uses a global $user but it is not set.
*/
function delete($id)
{
@ -247,7 +248,7 @@ class Products extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
return $this->product->delete(DolibarrApiAccess::$user);
return $this->product->delete($id);
}
/**

5
htdocs/product/class/product.class.php
View File

@ -878,19 +878,18 @@ class Product extends CommonObject
/**
* Delete a product from database (if not used)
*
* @param User $user Object user that ask to delete
* @param int $id Product id (usage of this is deprecated, delete should be called without parameters on a fetched object)
* @param int $notrigger Do not execute trigger
* @return int < 0 if KO, 0 = Not possible, > 0 if OK
*/
function delete($user, $id=0, $notrigger=0)
function delete($id=0, $notrigger=0)
{
// Deprecation warning
if ($id > 0) {
dol_syslog(__METHOD__ . " with parameter is deprecated", LOG_WARNING);
}
global $conf,$langs;
global $conf,$user,$langs;
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$error=0;

6
htdocs/webservices/server_productorservice.php
View File

@ -841,6 +841,10 @@ function deleteProductOrService($authentication,$listofidstring)
$error=0;
$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
// User must be defined to user authenticated
global $user;
$user=$fuser;
$listofid=explode(',',trim($listofidstring));
$listofiddeleted=array();
@ -869,7 +873,7 @@ function deleteProductOrService($authentication,$listofidstring)
}
else
{
$result=$newobject->delete($fuser);
$result=$newobject->delete();
if ($result <= 0)
{
$error++;

2
test/phpunit/ProductTest.php
View File

@ -232,7 +232,7 @@ class ProductTest extends PHPUnit_Framework_TestCase
$localobject=new Product($this->savdb);
$result=$localobject->fetch($id);
$result=$localobject->delete($user);
$result=$localobject->delete($id);
print __METHOD__." id=".$id." result=".$result."\n";
$this->assertLessThan($result, 0);