mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 16:44:28 +00:00
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
This commit is contained in:
@@ -99,7 +99,9 @@ class DirektGruppe extends FHCAPI_Controller
|
|||||||
if (isError($result))
|
if (isError($result))
|
||||||
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
|
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
|
||||||
|
|
||||||
$oe_array = $result;
|
$oe_array = [];
|
||||||
|
if (hasData($result))
|
||||||
|
$oe_array = getData($result);
|
||||||
|
|
||||||
if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
|
if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
|
||||||
!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid'))
|
!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid'))
|
||||||
|
|||||||
@@ -181,7 +181,10 @@ class Gruppe extends FHCAPI_Controller
|
|||||||
|
|
||||||
if (isError($result))
|
if (isError($result))
|
||||||
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
|
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
|
||||||
$oe_array = $result;
|
|
||||||
|
$oe_array = [];
|
||||||
|
if (hasData($result))
|
||||||
|
$oe_array = getData($result);
|
||||||
|
|
||||||
if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
|
if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
|
||||||
!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&
|
!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&
|
||||||
|
|||||||
Reference in New Issue
Block a user