Merge
This commit is contained in:
commit
866fc4d83e
@ -276,6 +276,13 @@ RESTLER:
|
||||
|
||||
$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
|
||||
|
||||
* Replace CommentParser.php line 423
|
||||
elseif (count($value) && is_numeric($value[0]))
|
||||
|
||||
with
|
||||
|
||||
elseif (count($value) && isset($value[0]) && is_numeric($value[0]))
|
||||
|
||||
|
||||
+With swagger 2 provided into /explorer:
|
||||
----------------------------------------
|
||||
|
||||
@ -124,7 +124,7 @@ $usercancreateorder = $user->rights->commande->creer;
|
||||
$usercancreateinvoice = $user->rights->facture->creer;
|
||||
$usercancreatecontract = $user->rights->contrat->creer;
|
||||
$usercancreateintervention = $user->hasRight('ficheinter', 'creer');
|
||||
$usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
|
||||
$usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer'));
|
||||
|
||||
$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
|
||||
$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
|
||||
|
||||
@ -107,7 +107,6 @@ class CommentParser
|
||||
|
||||
$p->extractData($comment);
|
||||
return $p->_data;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -420,7 +419,7 @@ class CommentParser
|
||||
$exception = $v1;
|
||||
array_shift($value);
|
||||
}
|
||||
} elseif (count($value) && is_numeric($value[0])) {
|
||||
} elseif (count($value) && isset($value[0]) && is_numeric($value[0])) {
|
||||
$code = $value[0];
|
||||
array_shift($value);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user