diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 3a253b3e2..3ce4926b7 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -72,10 +72,9 @@ class Status extends FHCAPI_Controller $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); $result = $this->BismeldestichtagModel->getLastReachedMeldestichtag(); - if (isError($result)) { - $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - return $this->terminateWithSuccess($result); + $data = $this->getDataOrTerminateWithError($result); + + $this->terminateWithSuccess($data); } public function isLastStatus($prestudent_id) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index b8002b64e..ae5a98958 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -199,7 +199,6 @@ export default{ if (this.dataMeldestichtag && this.dataMeldestichtag > rowData.datum) { row.getElement().classList.add('disabled'); - } }, layout: 'fitDataFill', @@ -754,9 +753,10 @@ export default{ .catch(this.$fhcAlert.handleSystemError); this.$fhcApi .get('api/frontend/v1/stv/status/getLastBismeldestichtag/') - .then(result => result.data) .then(result => { - this.dataMeldestichtag = result.retval[0].meldestichtag; + this.dataMeldestichtag = result.data[0].meldestichtag; + if (this.$refs.table.tableBuilt) + this.$refs.table.tabulator.redraw(true); }) .catch(this.$fhcAlert.handleSystemError); },