Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 16:12:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/user/card.php
View File

@@ -1514,7 +1514,7 @@ else
// Date employment
print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
print '<td>';
print dol_print_date($object->dateemployment);
print dol_print_date($object->dateemployment, 'day');
print '</td>';
print "</tr>\n";
@@ -1845,7 +1845,7 @@ else
if ($caneditgroup)
{
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
print img_delete($langs->trans("RemoveFromGroup"));
print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
print '</a>';
}
else

26
htdocs/user/class/api_users.class.php
View File

@@ -32,7 +32,7 @@ class Users extends DolibarrApi
* @var array $FIELDS Mandatory fields, checked when create and update object
*/
static $FIELDS = array(
'login'
'login',
);
/**
@@ -43,7 +43,8 @@ class Users extends DolibarrApi
/**
* Constructor
*/
function __construct() {
function __construct()
{
global $db, $conf;
$this->db = $db;
$this->useraccount = new User($this->db);
@@ -63,7 +64,8 @@ class Users extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @return array Array of User objects
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@@ -136,7 +138,8 @@ class Users extends DolibarrApi
*
* @throws RestException
*/
function get($id) {
function get($id)
{
//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
//throw new RestException(401);
//}
@@ -162,7 +165,8 @@ class Users extends DolibarrApi
* @param array $request_data New user data
* @return int
*/
function post($request_data = null) {
function post($request_data = null)
{
// check user authorization
//if(! DolibarrApiAccess::$user->rights->user->creer) {
// throw new RestException(401, "User creation not allowed");
@@ -194,7 +198,8 @@ class Users extends DolibarrApi
* @param array $request_data Datas
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
//throw new RestException(401);
//}
@@ -236,7 +241,8 @@ class Users extends DolibarrApi
*
* @url GET {id}/setGroup/{group}
*/
function setGroup($id, $group, $entity = 1) {
function setGroup($id, $group, $entity = 1)
{
global $conf;
@@ -280,7 +286,8 @@ class Users extends DolibarrApi
* @param int $id Account ID
* @return array
*/
function delete($id) {
function delete($id)
{
//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
//throw new RestException(401);
//}
@@ -363,7 +370,8 @@ class Users extends DolibarrApi
* @return array
* @throws RestException
*/
function _validate($data) {
function _validate($data)
{
$account = array();
foreach (Users::$FIELDS as $field)
{