From 6bc58c00b79e7d07a592bc1a26e6e62e1b0d7e74 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Tue, 10 Sep 2024 10:50:02 +0200 Subject: [PATCH] unruly controller benutzerrechte; studstatus unruly api fix; --- .../api/frontend/v1/unrulyperson/UnrulyPerson.php | 2 +- public/js/components/Studierendenantrag/Antrag.js | 3 --- .../Studierendenantrag/Form/Abmeldung.js | 13 ------------- .../Studierendenantrag/Form/AbmeldungStgl.js | 15 +++++++++++++++ 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php index a1673739a..b25e3dd02 100644 --- a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php +++ b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php @@ -25,7 +25,7 @@ class UnrulyPerson extends FHCAPI_Controller public function __construct() { parent::__construct([ - 'updatePersonUnrulyStatus' => 'basis/mitarbeiter:rw' + 'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/anrechnung:rw' , 'student/studierendenantrag:rw') ]); $this->_ci =& get_instance(); diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js index 29ed40592..37de9314d 100644 --- a/public/js/components/Studierendenantrag/Antrag.js +++ b/public/js/components/Studierendenantrag/Antrag.js @@ -37,9 +37,6 @@ export default { return this.$p.t('studierendenantrag/info_' + this.antragType + '_' + this.status); } }, - mounted() { - console.log(this) - }, template: `
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js index ab75c7a53..7486f9095 100644 --- a/public/js/components/Studierendenantrag/Form/Abmeldung.js +++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js @@ -77,16 +77,6 @@ export default { this.formData.grund ) .then(result => { - console.log(this.formData.grund) - // TODO: replace this with actual identifier after demo porpuses - if(this.formData.grund === '<< PHRASE textLong_unruly>>') { - this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, true).then( - (res)=> { - if(res?.meta?.status === "success") { - this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated')) - } - }) - } if (result.data === true) document.location += ""; @@ -155,9 +145,6 @@ export default { created() { this.uuid = _uuid++; }, - mounted() { - console.log(this) - }, template: `
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js index 16cf187b4..ccb25a632 100644 --- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js +++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js @@ -79,6 +79,16 @@ export default { this.formData.grund ) .then(result => { + + if(this.unrulyInternal) { + this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, true).then( + (res)=> { + if(res?.meta?.status === "success") { + this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated')) + } + }) + } + if (result.data === true) document.location += ""; @@ -113,6 +123,11 @@ export default { created() { this.uuid = _uuid++; }, + watch: { + 'formData.grund'(newVal) { + this.unrulyInternal = (newVal === this.$p.t('studierendenantrag', 'mark_person_as_unruly')) + } + }, template: `