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

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source
This commit is contained in:
Paminger
2016-08-19 10:23:19 +02:00
parent 58bd4d003d 60681d5402
commit b46692913c
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/content/Dms.php
+24 -13
View File
@@ -67,25 +67,36 @@ class Dms extends APIv1_Controller
{
$result = null;
if (isset($dms['dms_id']))
if(isset($dms['new']) && $dms['new'] == true)
{
// Remove new parameter to avoid DB insert errors
unset($dms['new']);
if (($filename = $this->_saveFileOnInsert($dms)) !== false)
{
$result = $this->DmsModel->insert($this->DmsModel->filterFields($dms));
if ($result->error == EXIT_SUCCESS)
{
$result = $this->DmsVersionModel->insert(
$this->DmsVersionModel->filterFields($dms, $result->retval, $filename)
);
}
}
}
else
{
if ($this->_saveFileOnUpdate($dms))
{
$result = $this->DmsModel->update($dms['dms_id'], $this->DmsModel->filterFields($dms));
if ($result->error == EXIT_SUCCESS)
{
$result = $this->DmsVersionModel->update(array($dms['dms_id'], $dms['version']), $this->DmsVersionModel->filterFields($dms));
}
}
}
else
{
if (($filename = $this->_saveFileOnInsert($dms)) !== false)
{
$result = $this->DmsModel->insert($this->DmsModel->filterFields($dms));
if ($result->error == EXIT_SUCCESS)
{
$result = $this->DmsVersionModel->insert($this->DmsVersionModel->filterFields($dms, $result->retval, $filename));
$result = $this->DmsVersionModel->update(
array(
$dms['dms_id'],
$dms['version']
),
$this->DmsVersionModel->filterFields($dms)
);
}
}
}