blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Funktionalitaet feature-39602

Browse Source
This commit is contained in:
ma0068
2024-05-27 14:57:18 +02:00
parent 21fb679c08
commit 259a3c218a
6 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Studentenverwaltung.php
+2 -2
View File
@@ -26,8 +26,8 @@ class Studentenverwaltung extends FHC_Controller
'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
'admin' => $this->permissionlib->isBerechtigt('admin'),
'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung')
'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht')
],
'variables' => [
'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
application/controllers/api/frontend/v1/stv/Status.php
+2 -1
View File
@@ -484,8 +484,9 @@ class Status extends FHCAPI_Controller
$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
$isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == "Abgewiesener";
if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) && !$isBerechtigtToDeleteAbgewiesen)
{
return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
}
application/models/crm/Prestudent_model.php
+2 -2
View File
@@ -764,9 +764,9 @@ class Prestudent_model extends DB_Model
ps.updatevon
FROM
public.tbl_prestudentstatus ps
JOIN
LEFT JOIN
public.tbl_student st USING (prestudent_id)
JOIN
LEFT JOIN
public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
LEFT JOIN
lehre.tbl_studienplan sp USING (studienplan_id)