From 27e228609666a6a1082387474b67335403630c08 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 23 Nov 2023 15:50:02 +0100 Subject: [PATCH] getNations --- .../controllers/components/stv/Kontakt.php | 16 +++++++++++++++- .../Details/Kontakt/Address.js | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php index b4e7385aa..02c2ca70a 100644 --- a/application/controllers/components/stv/Kontakt.php +++ b/application/controllers/components/stv/Kontakt.php @@ -8,7 +8,6 @@ class Kontakt extends FHC_Controller { public function __construct() { - // TODO(chris): access! parent::__construct(); // Load Libraries @@ -217,6 +216,21 @@ class Kontakt extends FHC_Controller return $this->outputJsonSuccess(current(getData($result))); } + public function getNations() + { + $this->load->model('codex/Nation_model', 'NationModel'); + + $this->NationModel->addOrder('kurztext'); + + $result = $this->NationModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson(getError($result)); + } else { + $this->outputJson(getData($result) ?: []); + } + } + public function getAdressentypen() { $this->load->model('person/Adressentyp_model', 'AdressentypModel'); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index 7a0197dc9..2c42ccc6b 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -275,7 +275,7 @@ export default{ }, created(){ CoreRESTClient - .get('components/stv/Student/getNations') + .get('components/stv/Kontakt/getNations') .then(result => { this.nations = result.data; })