diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index d1f259cc4..23a8fc7cb 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -513,7 +513,9 @@ class Student extends FHCAPI_Controller if ($this->db->trans_status() === FALSE) $this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL); - $this->terminateWithSuccess($result); + $data = $this->getDataOrTerminateWithError($result); + + $this->terminateWithSuccess($data); } protected function addInteressent() @@ -695,7 +697,7 @@ class Student extends FHCAPI_Controller //Studentendatensatz anlegen //StudentLehrverband anlegen } - + } // TODO(chris): DEBUG /*$result = $this->PrestudentModel->loadWhere([ 'pestudent_id' => 1 @@ -704,7 +706,7 @@ class Student extends FHCAPI_Controller return $result; }*/ - return success(true); + return success($person_id); } public function requiredIfNotPersonId($value) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js index 8416dadd4..adcf2f2a8 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js @@ -391,7 +391,7 @@ export default { // stuff to do after new person has been saved personSaved(result) { this.$api - .call(ApiStvProjektbetreuer.getPerson(result.person_id)) + .call(ApiStvProjektbetreuer.getPerson(result)) .then(response => { // set the new person in Betreuer autocomplete field this.autocompleteSelectedBetreuer = response.data; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 41cf4c9cf..97b556239 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -49801,7 +49801,7 @@ and represent the current state of research on the topic. The prescribed citatio 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Projektbetreuer ungültig', + 'text' => 'ProjektbetreuerIn ungültig', 'description' => '', 'insertvon' => 'system' ), @@ -49821,7 +49821,7 @@ and represent the current state of research on the topic. The prescribed citatio 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Löschen nicht möglich, Projektbetreuer hat bereits einen Vertrag', + 'text' => 'Löschen nicht möglich, ProjektbetreuerIn hat bereits einen Vertrag', 'description' => '', 'insertvon' => 'system' ), @@ -50261,7 +50261,7 @@ and represent the current state of research on the topic. The prescribed citatio 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Betreuer bearbeiten', + 'text' => 'BetreuerIn bearbeiten', 'description' => '', 'insertvon' => 'system' ), @@ -50281,7 +50281,7 @@ and represent the current state of research on the topic. The prescribed citatio 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Betreuer speichern', + 'text' => 'BetreuerIn speichern', 'description' => '', 'insertvon' => 'system' ),