Merge branch '1.0-local' into 1.0
This commit is contained in:
commit
af2ee38fdb
|
@ -135,7 +135,7 @@
|
||||||
$grantedFor = [];
|
$grantedFor = [];
|
||||||
|
|
||||||
/* (2) Search an action the user can perform in the list */
|
/* (2) Search an action the user can perform in the list */
|
||||||
foreach($actionlist as $id_action=>$acttion){
|
foreach($actionlist as $id_action=>$action){
|
||||||
|
|
||||||
/* (3) If have permission -> add to list */
|
/* (3) If have permission -> add to list */
|
||||||
if( in_array($id_action, $user['can']) )
|
if( in_array($id_action, $user['can']) )
|
||||||
|
@ -192,7 +192,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (7) Extract corresponding action */
|
/* (7) Extract corresponding action */
|
||||||
$action = $grantedFor[$toPerform];
|
$action = $actionlist[$toPerform];
|
||||||
|
|
||||||
|
|
||||||
var_dump($action);
|
var_dump($action);
|
||||||
|
|
Loading…
Reference in New Issue