From 684a741f2a86b2ffa56d70f299d0cb73a73e643a Mon Sep 17 00:00:00 2001 From: ma0048 Date: Tue, 31 Oct 2023 08:33:10 +0100 Subject: [PATCH 1/4] - bugfix --- application/models/crm/Rueckstellung_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/crm/Rueckstellung_model.php b/application/models/crm/Rueckstellung_model.php index d2c39ffde..c84c625eb 100644 --- a/application/models/crm/Rueckstellung_model.php +++ b/application/models/crm/Rueckstellung_model.php @@ -20,7 +20,7 @@ class Rueckstellung_model extends DB_Model $this->addLimit(1); $this->addJoin('tbl_rueckstellung_status', 'status_kurzbz'); $this->addSelect('*, - array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . 'as bezeichnung'); + array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . ' as bezeichnung'); $this->addOrder('datum_bis', 'DESC'); $where['person_id'] = $person_id; From ccace2f826533094f6475afb6f4c5dc867cadab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 31 Oct 2023 11:16:53 +0100 Subject: [PATCH 2/4] Fehler beim Laden der Lehrauftragsliste korrigiert mit Postgres15 --- application/views/lehre/lehrauftrag/orderLehrauftragData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php index 48afd72a6..85b663d4a 100644 --- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php +++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php @@ -159,7 +159,7 @@ FROM ( SELECT /* lehrauftraege also planned with dummies, therefore personalnummer is needed */ - ma.personalnummer, + ma.personalnummer::text, lema.lehreinheit_id, lv.lehrveranstaltung_id, lv.bezeichnung AS "lv_bezeichnung", @@ -272,7 +272,7 @@ FROM pa.lehreinheit_id, lv.lehrveranstaltung_id, lv.bezeichnung AS "lv_bezeichnung", - pa.projektarbeit_id AS "projektarbeit_id", + pa.projektarbeit_id::text AS "projektarbeit_id", le.studiensemester_kurzbz, stg.studiengang_kz, upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz", From fdb4eb5e7db41fcb602dc34086c5ff17f480fd26 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 31 Oct 2023 13:16:25 +0100 Subject: [PATCH 3/4] Link Stgl Sammelmail --- application/controllers/jobs/AntragJob.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index d435f1818..8d55faf42 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -165,6 +165,7 @@ class AntragJob extends JOB_Controller } $data['table'] = $data['table_' . DEFAULT_LANGUAGE]; + $data['leitungLink'] = CIS_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung'; //Mail an Stgl und Assistenz $to = $leitung['Details']->uid . '@' . DOMAIN; From 8971f79a77f76f51a8b7d6104e41bb51c806c845 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 31 Oct 2023 13:23:56 +0100 Subject: [PATCH 4/4] Verwendung von APP_ROOT --- application/controllers/jobs/AntragJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 8d55faf42..3022cf549 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -165,7 +165,7 @@ class AntragJob extends JOB_Controller } $data['table'] = $data['table_' . DEFAULT_LANGUAGE]; - $data['leitungLink'] = CIS_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung'; + $data['leitungLink'] = APP_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung'; //Mail an Stgl und Assistenz $to = $leitung['Details']->uid . '@' . DOMAIN;