mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-26 00:54:27 +00:00
permission check bug fixed
This commit is contained in:
@@ -414,7 +414,9 @@ class Lehreinheit 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') &&
|
||||||
|
|||||||
@@ -284,7 +284,9 @@ class Lektor 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);
|
||||||
|
|
||||||
return $this->checkPermissionGenerel($permissions, $oe_array);
|
return $this->checkPermissionGenerel($permissions, $oe_array);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -223,13 +223,14 @@ class Stundenplandev_model extends DB_Model
|
|||||||
|
|
||||||
public function deleteLektorPlanning($lehreinheit_id, $mitarbeiter_uid)
|
public function deleteLektorPlanning($lehreinheit_id, $mitarbeiter_uid)
|
||||||
{
|
{
|
||||||
$this->addDistinct('mitarbeiter_uid');
|
//TODO (david) prüfen ob der check notwendig ist
|
||||||
|
/*$this->addDistinct('mitarbeiter_uid');
|
||||||
$this->addSelect('mitarbeiter_uid');
|
$this->addSelect('mitarbeiter_uid');
|
||||||
$stundenplan_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
|
$stundenplan_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
|
||||||
$stundenplan_array = hasData($stundenplan_result) ? (getData($stundenplan_result)) : array();
|
$stundenplan_array = hasData($stundenplan_result) ? (getData($stundenplan_result)) : array();
|
||||||
|
|
||||||
if (sizeof($stundenplan_array) <= 1)
|
if (sizeof($stundenplan_array) <= 1)
|
||||||
return error('Diese/r LektorIn kann nicht aus dem LVPlan entfernt werden da dies der/die letzte verplante LektorIn ist');
|
return error('Diese/r LektorIn kann nicht aus dem LVPlan entfernt werden da dies der/die letzte verplante LektorIn ist');*/
|
||||||
|
|
||||||
$this->addJoin('lehre.tbl_stundenplan_betriebsmittel', 'stundenplandev_id');
|
$this->addJoin('lehre.tbl_stundenplan_betriebsmittel', 'stundenplandev_id');
|
||||||
$betriebsmittel_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'tbl_stundenplandev.mitarbeiter_uid' => $mitarbeiter_uid));
|
$betriebsmittel_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'tbl_stundenplandev.mitarbeiter_uid' => $mitarbeiter_uid));
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ export default {
|
|||||||
{
|
{
|
||||||
return {
|
return {
|
||||||
method: 'post',
|
method: 'post',
|
||||||
url: '/api/frontend/v1/lv/gruppe/deleteLVPlan/',
|
url: '/api/frontend/v1/lv/gruppe/deleteFromLVPlan/',
|
||||||
params: deleteData
|
params: deleteData
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -253,6 +253,7 @@ export default{
|
|||||||
<form-input
|
<form-input
|
||||||
:label="$p.t('lehre', 'gesamtkosten')"
|
:label="$p.t('lehre', 'gesamtkosten')"
|
||||||
type="number"
|
type="number"
|
||||||
|
name="gesamtkosten"
|
||||||
container-class="col-3"
|
container-class="col-3"
|
||||||
readonly
|
readonly
|
||||||
v-model="berechneteGesamtkosten"
|
v-model="berechneteGesamtkosten"
|
||||||
|
|||||||
Reference in New Issue
Block a user