From e34bda96496f587ee84d70eba4a22ca9a59ad36e Mon Sep 17 00:00:00 2001 From: nscbrandb Date: Tue, 17 May 2016 15:47:33 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Composer=20Merge-Plugin=20f=C3=BCr=20AddOn-?= =?UTF-8?q?spezifische=20composer.json's?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b0dad7641..0e36d6f6f 100755 --- a/composer.json +++ b/composer.json @@ -54,7 +54,8 @@ "zetacomponents/workflow": "1.*", "zetacomponents/document": "1.*", "zetacomponents/workflow-database-tiein": "1.*", - "zetacomponents/workflow-event-log-tiein": "1.*" + "zetacomponents/workflow-event-log-tiein": "1.*", + "wikimedia/composer-merge-plugin": "^1.3" }, "require-dev": { @@ -63,5 +64,19 @@ "config": { "bin-dir": "bin" - } + }, + + "extra": { + "merge-plugin": { + "include": [ + "composer.json", + "addons/*/composer.json" + ], + "recurse": true, + "replace": false, + "merge-dev": false, + "merge-extra": false + } + } + } From 3bf093fd2c8c8c08e64aad503148b627bc5b45b2 Mon Sep 17 00:00:00 2001 From: nscbrandb Date: Mon, 23 May 2016 09:44:01 +0200 Subject: [PATCH 2/5] Fix --- ci_hack.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_hack.php b/ci_hack.php index 8bafa5f7b..7de79d3cb 100755 --- a/ci_hack.php +++ b/ci_hack.php @@ -369,5 +369,5 @@ require_once(dirname(__FILE__).'/application/core/FHC_Model.php'); $model=new CI_Model(); // Traits -require_once(dirname(__FILE__).'db_extra.php'); +require_once(dirname(__FILE__).'/ci_db_extra.php'); From 42d0ef79fd75d395830fd1d63109b7d2a2ea4280 Mon Sep 17 00:00:00 2001 From: nscbrandb Date: Mon, 23 May 2016 11:44:03 +0200 Subject: [PATCH 3/5] undoing ci_hack.php --- ci_hack.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_hack.php b/ci_hack.php index 962c22d6a..a7cfe5d02 100755 --- a/ci_hack.php +++ b/ci_hack.php @@ -369,4 +369,4 @@ require_once(dirname(__FILE__).'/application/core/FHC_Model.php'); $model=new CI_Model(); // Traits -require_once(dirname(__FILE__).'/ci_db_extra.php'); +require_once(dirname(__FILE__).'/ci_db_extra.php'); \ No newline at end of file From facb7750d70a5f1fb40acb505e67b2de2ef254cb Mon Sep 17 00:00:00 2001 From: Stefan Puraner Date: Tue, 24 May 2016 09:27:27 +0200 Subject: [PATCH 4/5] added method to get all data --- application/controllers/api/v1/codex/Orgform.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/controllers/api/v1/codex/Orgform.php b/application/controllers/api/v1/codex/Orgform.php index 82736830e..f74cb967f 100644 --- a/application/controllers/api/v1/codex/Orgform.php +++ b/application/controllers/api/v1/codex/Orgform.php @@ -70,6 +70,13 @@ class Orgform extends APIv1_Controller $this->response(); } } + + public function getAll() + { + $result = $this->OrgformModel->loadWhole(); + + $this->response($result, REST_Controller::HTTP_OK); + } private function _validate($orgform = NULL) { From 71f3b91516e78544393321e74c734c623401033a Mon Sep 17 00:00:00 2001 From: Stefan Puraner Date: Tue, 24 May 2016 10:05:43 +0200 Subject: [PATCH 5/5] removed debugging code --- .../api/v1/crm/Prestudentstatus.php | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/application/controllers/api/v1/crm/Prestudentstatus.php b/application/controllers/api/v1/crm/Prestudentstatus.php index f1bfda16a..07cd96f48 100644 --- a/application/controllers/api/v1/crm/Prestudentstatus.php +++ b/application/controllers/api/v1/crm/Prestudentstatus.php @@ -57,32 +57,30 @@ class Prestudentstatus extends APIv1_Controller { $prestudentstatus = $this->_parseData($this->post()); - $this->response($prestudentstatus); - - if ($this->_validate($prestudentstatus)) - { - if (isset($prestudentstatus['ausbildungssemester']) && isset($prestudentstatus['studiensemester_kurzbz']) && - isset($prestudentstatus['status_kurzbz']) && isset($prestudentstatus['prestudent_id'])) - { - $pksArray = array($prestudentstatus['ausbildungssemester'], - $prestudentstatus['studiensemester_kurzbz'], - $prestudentstatus['status_kurzbz'], - $prestudentstatus['prestudent_id'] - ); - - $result = $this->PrestudentstatusModel->update($pksArray, $prestudentstatus); - } - else - { - $result = $this->PrestudentstatusModel->insert($prestudentstatus); - } - - $this->response($result, REST_Controller::HTTP_OK); - } - else - { - $this->response(); - } + if ($this->_validate($prestudentstatus)) + { + if (isset($prestudentstatus['ausbildungssemester']) && isset($prestudentstatus['studiensemester_kurzbz']) && + isset($prestudentstatus['status_kurzbz']) && isset($prestudentstatus['prestudent_id'])) + { + $pksArray = array($prestudentstatus['ausbildungssemester'], + $prestudentstatus['studiensemester_kurzbz'], + $prestudentstatus['status_kurzbz'], + $prestudentstatus['prestudent_id'] + ); + + $result = $this->PrestudentstatusModel->update($pksArray, $prestudentstatus); + } + else + { + $result = $this->PrestudentstatusModel->insert($prestudentstatus); + } + + $this->response($result, REST_Controller::HTTP_OK); + } + else + { + $this->response(); + } } private function _validate($prestudentstatus = NULL)