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

Zugriffsrechte für Abbrecher & Unterbrecher

Browse Source
This commit is contained in:
cgfhtw
2023-07-10 13:52:05 +02:00
parent 1006132451
commit eee3aa08e4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/AntragLib.php
+1 -1
View File
@@ -912,7 +912,7 @@ class AntragLib
$datumStatus = $result->datum;
if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ IN' => [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL], 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED], [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL]);
if (isError($result))
return $result;
if (hasData($result))
application/models/education/Studierendenantrag_model.php
+5 -3
View File
@@ -84,7 +84,7 @@ class Studierendenantrag_model extends DB_Model
return $this->loadWhere($where);
}
public function loadWithStatusWhere($where)
public function loadWithStatusWhere($where, $types = null)
{
$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
@@ -97,6 +97,10 @@ class Studierendenantrag_model extends DB_Model
'campus.get_status_studierendenantrag(studierendenantrag_id)=t.studierendenantrag_statustyp_kurzbz'
);
if ($types && is_array($types)) {
$this->db->where_in('typ' => $types);
}
$this->addOrder('datum', 'DESC');
return $this->loadWhere($where);
@@ -187,8 +191,6 @@ class Studierendenantrag_model extends DB_Model
$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
$this->addJoin('campus.tbl_studierendenantrag_statustyp st', 'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz','LEFT');
$this->db->where_in('public.get_rolle_prestudent(p.prestudent_id, null)', $this->config->item('antrag_prestudentstatus_whitelist'));
return $this->loadWhere([
'p.person_id' => $person_id
]);