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

Merge pull request #14507 from pstructures/PSdevelop

Browse Source 
Projects added as type in Categories API
This commit is contained in:
Laurent Destailleur 2020-08-23 18:25:08 +02:00 committed by GitHub
commit 90e01888d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/categories/class/api_categories.class.php
View File

@ -20,10 +20,12 @@ use Luracast\Restler\RestException;
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/api_members.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/api_members.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/api_products.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/api_products.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/api_contacts.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/api_contacts.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/api_thirdparties.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/api_thirdparties.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/api_projects.class.php';
/** /**
* API class for categories * API class for categories
@ -48,7 +50,7 @@ class Categories extends DolibarrApi
3 => 'member', 3 => 'member',
4 => 'contact', 4 => 'contact',
5 => 'account', 5 => 'account',
//6 => 'project', 6 => 'project',
//7 => 'user', //7 => 'user',
//8 => 'bank_line', //8 => 'bank_line',
//9 => 'warehouse', //9 => 'warehouse',
@ -179,7 +181,8 @@ class Categories extends DolibarrApi
} }
$i++; $i++;
} }
} else { }
else {
throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror()); throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
} }
if (!count($obj_ret)) { if (!count($obj_ret)) {
@ -242,7 +245,8 @@ class Categories extends DolibarrApi
if ($this->category->update(DolibarrApiAccess::$user) > 0) if ($this->category->update(DolibarrApiAccess::$user) > 0)
{ {
return $this->get($id); return $this->get($id);
} else { } else
{
throw new RestException(500, $this->category->error); throw new RestException(500, $this->category->error);
} }
} }
@ -285,7 +289,7 @@ class Categories extends DolibarrApi
* Get the list of categories linked to an object * Get the list of categories linked to an object
* *
* @param int $id Object ID * @param int $id Object ID
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact') * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact', 'project')
* @param string $sortfield Sort field * @param string $sortfield Sort field
* @param string $sortorder Sort order * @param string $sortorder Sort order
* @param int $limit Limit for list * @param int $limit Limit for list
@ -303,7 +307,8 @@ class Categories extends DolibarrApi
Categorie::TYPE_CONTACT, Categorie::TYPE_CONTACT,
Categorie::TYPE_CUSTOMER, Categorie::TYPE_CUSTOMER,
Categorie::TYPE_SUPPLIER, Categorie::TYPE_SUPPLIER,
Categorie::TYPE_MEMBER Categorie::TYPE_MEMBER,
Categorie::TYPE_PROJECT
])) { ])) {
throw new RestException(401); throw new RestException(401);
} }
@ -318,6 +323,8 @@ class Categories extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) { } elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) {
throw new RestException(401); throw new RestException(401);
} elseif ($type == Categorie::TYPE_PROJECT && !DolibarrApiAccess::$user->rights->projet->lire) {
throw new RestException(401);
} }
$categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page); $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
@ -326,7 +333,7 @@ class Categories extends DolibarrApi
if ($categories == 0) { if ($categories == 0) {
throw new RestException(404, 'No category found for this object'); throw new RestException(404, 'No category found for this object');
} }
throw new RestException(500, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors)); throw new RestException(600, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors));
} }
return $categories; return $categories;
} }
@ -727,7 +734,7 @@ class Categories extends DolibarrApi
* Get the list of objects in a category. * Get the list of objects in a category.
* *
* @param int $id ID of category * @param int $id ID of category
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact') * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact', 'project')
* @param int $onlyids Return only ids of objects (consume less memory) * @param int $onlyids Return only ids of objects (consume less memory)
* *
* @return mixed * @return mixed
@ -773,7 +780,10 @@ class Categories extends DolibarrApi
} elseif ($type == 'contact') { } elseif ($type == 'contact') {
$objects_api = new Contacts(); $objects_api = new Contacts();
} }
if (is_object($objects_api)) elseif ($type == 'project') {
$objects_api = new Projects();
}
if (is_object($objects_api))
{ {
foreach ($objects as $obj) { foreach ($objects as $obj) {
$cleaned_objects[] = $objects_api->_cleanObjectDatas($obj); $cleaned_objects[] = $objects_api->_cleanObjectDatas($obj);