blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 17:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4

Browse Source
This commit is contained in:
cgfhtw
2023-07-25 14:07:17 +02:00
parent 764628d5fb 02b64ad6a7
commit cfe7c5b0da
7 changed files with 124 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/AntragLib.php
+4 -3
View File
@@ -259,7 +259,6 @@ class AntragLib
*/
public function denyObjectionAbmeldung($studierendenantrag_id, $insertvon, $grund = null)
{
// TODO(chris): grund?
$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
if (isError($result))
{
@@ -282,6 +281,9 @@ class AntragLib
$status = current(getData($result));
if ($grund)
$grund = $this->_ci->p->t('studierendenantrag', 'mail_part_grund', ['grund' => $grund]);
$result = $this->_ci->StudierendenantragstatusModel->insert([
'studierendenantrag_id' => $studierendenantrag_id,
'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
@@ -1625,8 +1627,7 @@ class AntragLib
if ($antrag->typ != Studierendenantrag_model::TYP_ABMELDUNG_STGL)
return $this->isOwnAntrag($antrag_id);
// TODO(chris): assistenz can not cancel - should they be able to?
return false;
return $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag');
}
/**