Image permissions at last.
このコミットが含まれているのは:
コミット
c358ddf540
|
@ -77,8 +77,8 @@ class AuthController extends Controller {
|
|||
$userpermusr = $this->objPermission->getPermissionUser('usr', $check);
|
||||
|
||||
// Image permissions.
|
||||
// $grouppermimg = $this->objPermission->getPermissionGroup('img', $perm['perm_id']);
|
||||
// $userpermimg = $this->objPermission->getPermissionUser('img', $check);
|
||||
$grouppermimg = $this->objPermission->getPermissionGroup('img', $perm['perm_id']);
|
||||
$userpermimg = $this->objPermission->getPermissionUser('img', $check);
|
||||
|
||||
// Invoice permissions.
|
||||
$groupperminv = $this->objPermission->getPermissionGroup('inv', $perm['perm_id']);
|
||||
|
@ -89,7 +89,7 @@ class AuthController extends Controller {
|
|||
$forarr = array();
|
||||
$strarr = array();
|
||||
$usrarr = array();
|
||||
// $imgarr = array();
|
||||
$imgarr = array();
|
||||
$invarr = array();
|
||||
|
||||
if (!empty($userpermblg[0])) {
|
||||
|
@ -152,12 +152,12 @@ class AuthController extends Controller {
|
|||
$invarr
|
||||
);
|
||||
|
||||
/* if (!empty($userpermimg[0])) {
|
||||
if (!empty($userpermimg[0])) {
|
||||
$imgarr = (array)$userpermimg[0];
|
||||
}
|
||||
else {
|
||||
$imgarr = (array)$grouppermimg[0];
|
||||
} */
|
||||
}
|
||||
|
||||
$merge = array();
|
||||
$merge1 = array();
|
||||
|
@ -186,7 +186,7 @@ class AuthController extends Controller {
|
|||
$grouppermusr = $this->objPermission->getPermissionGroup('usr', 6);
|
||||
|
||||
// Image permissions.
|
||||
// $grouppermimg = $this->objPermission->getPermissionGroup('img', 6);
|
||||
$grouppermimg = $this->objPermission->getPermissionGroup('img', 6);
|
||||
|
||||
// Invoice permissions.
|
||||
$groupperminv = $this->objPermission->getPermissionGroup('inv', 6);
|
||||
|
@ -212,10 +212,10 @@ class AuthController extends Controller {
|
|||
(array)$grouppermusr[0]
|
||||
);
|
||||
|
||||
/* (array)$grouppermimg[0] = array_combine(
|
||||
(array)$grouppermimg[0] = array_combine(
|
||||
array_map(function($k){ return 'img_'.$k; }, array_keys((array)$grouppermimg[0])),
|
||||
(array)$grouppermimg[0]
|
||||
); */
|
||||
);
|
||||
|
||||
(array)$groupperminv[0] = array_combine(
|
||||
array_map(function($k){ return 'inv_'.$k; }, array_keys((array)$groupperminv[0])),
|
||||
|
|
新しいイシューから参照