blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-06 14:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source
This commit is contained in:
paolo
2016-06-15 11:23:03 +02:00
parent 8d109cf170 86a98e9a8c
commit 28751df237
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -21,3 +21,4 @@ tests/codeception/_output/*
composer.lock
bin
/tests/codeception/api.suite.yml
/application/logs/
application/controllers/api/v1/content/Dms.php
+10 -9
View File
@@ -94,27 +94,28 @@ class Dms extends APIv1_Controller
*/
public function postDms()
{
if ($this->_validate($this->post()))
$dms = $this->_parseData($this->post());
if ($this->_validate($dms))
{
if (isset($this->post()['dms_id']))
if (isset($dms['dms_id']))
{
if ($this->_saveFileOnUpdate($this->post()))
if ($this->_saveFileOnUpdate($dms))
{
$result = $this->DmsModel->update($this->post()['dms_id'], $this->_dmsFieldsArray($this->post()));
$result = $this->DmsModel->update($dms['dms_id'], $this->_dmsFieldsArray($dms));
if ($result->error == EXIT_SUCCESS)
{
$result = $this->DmsModel->updateDmsVersion($this->post()['dms_id'], $this->_dmsVersionFieldsArray($this->post()));
$result = $this->DmsModel->updateDmsVersion($dms['dms_id'], $this->_dmsVersionFieldsArray($dms));
}
}
}
else
{
if (($fileName = $this->_saveFileOnInsert($this->post())) !== false)
if (($fileName = $this->_saveFileOnInsert($dms)) !== false)
{
$result = $this->DmsModel->insert($this->_dmsFieldsArray($this->post()));
$result = $this->DmsModel->insert($this->_dmsFieldsArray($dms));
if ($result->error == EXIT_SUCCESS)
{
$result = $this->DmsModel->insertDmsVersion($this->_dmsVersionFieldsArray($this->post(), $result->retval, $fileName));
$result = $this->DmsModel->insertDmsVersion($this->_dmsVersionFieldsArray($dms, $result->retval, $fileName));
}
}
}
@@ -273,4 +274,4 @@ class Dms extends APIv1_Controller
return true;
}
}
}