From c8e4b463b53960b2386c6abb8e2c3992f8688b23 Mon Sep 17 00:00:00 2001 From: Gerry Raab Date: Wed, 22 Jun 2016 17:19:43 +0200 Subject: [PATCH] new phrase inhalt --- application/controllers/system/Phrases.php | 34 ++++++------------- application/libraries/PhrasesLib.php | 6 ++-- application/views/system/phrasesList.php | 2 +- .../views/system/phrasesinhaltList.php | 2 +- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php index 28e186014..4bc0ad209 100644 --- a/application/controllers/system/Phrases.php +++ b/application/controllers/system/Phrases.php @@ -90,20 +90,21 @@ class Phrases extends FHC_Controller public function newText() { - $vorlage_kurzbz = $this->input->post('vorlage_kurzbz', TRUE); + $phrase_id = $this->input->post('phrase_id', TRUE); $data = array ( - 'vorlage_kurzbz' => $vorlage_kurzbz, - 'studiengang_kz' => 0, - 'version' => 1, - 'oe_kurzbz' => 'etw' + 'phrase_id' => $phrase_id, + 'sprache' => 'German', + 'text' => '', + 'description' => '', + 'orgeinheit_kurzbz' => 'etw' ); - $vorlagetext = $this->vorlagelib->insertVorlagetext($data); - if ($vorlagetext->error) - show_error($vorlagetext->retval); - $vorlagestudiengang_id = $vorlagetext->retval; + $phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data); + if ($phrase_inhalt->error) + show_error($phrase_inhalt->retval); + $phrase_inhalt_id = $phrase_inhalt->retval; - redirect('/system/Templates/editText/'.$vorlagestudiengang_id); + redirect('/system/Phrases/editText/'.$phrase_inhalt_id); } public function editText($phrase_inhalt_id) @@ -131,17 +132,4 @@ class Phrases extends FHC_Controller //$this->load->view('system/templatetextEdit', $data); } - public function preview($vorlagestudiengang_id) - { - $formdata = $this->input->post('formdata', FALSE); - $daten = json_decode($formdata, TRUE); - $vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id); - if ($vorlagetext->error) - show_error($vorlagetext->retval); - $data = array - ( - 'text' => $this->vorlagelib->parseVorlagetext($vorlagetext->retval[0]->text, $daten) - ); - $this->load->view('system/templatetextPreview', $data); - } } diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index 1cc023863..a01eb8807 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -112,10 +112,10 @@ class PhrasesLib * @param string $vorlage_kurzbz REQUIRED * @return array */ - function insertVorlagetext($data) + function insertPhraseinhalt($data) { - $vorlagetext = $this->ci->VorlageStudiengangModel->insert($data); - return $vorlagetext; + $phrase_inhalt = $this->ci->PhraseInhaltModel->insert($data); + return $phrase_inhalt; } /** diff --git a/application/views/system/phrasesList.php b/application/views/system/phrasesList.php index 6cfa3d17c..ff293c58f 100644 --- a/application/views/system/phrasesList.php +++ b/application/views/system/phrasesList.php @@ -25,7 +25,7 @@ App: aufnahme phrase_id; ?> phrase; ?> - View + Inhalte anzeigen diff --git a/application/views/system/phrasesinhaltList.php b/application/views/system/phrasesinhaltList.php index bcc046031..8e4897ff4 100644 --- a/application/views/system/phrasesinhaltList.php +++ b/application/views/system/phrasesinhaltList.php @@ -5,7 +5,7 @@

Phrase Inhalt -

-
+