fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support file upload in extra vars

Browse source
This commit is contained in:
Kijin Sung 2024-10-09 00:03:16 +09:00
parent d45c116c56
commit 50274a7f9b
2 changed files with 97 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

82
modules/document/document.controller.php
View file

@ -818,7 +818,11 @@ class DocumentController extends Document
if(isset($obj->{'extra_vars'.$idx}))
{
$tmp = $obj->{'extra_vars'.$idx};
if(is_array($tmp))
if ($extra_item->type === 'file')
{
$value = $tmp;
}
elseif (is_array($tmp))
{
$value = implode('|@|', $tmp);
}
@ -832,7 +836,7 @@ class DocumentController extends Document
$value = trim($obj->{$extra_item->name});
}
// Validate the extra value.
// Validate and process the extra value.
if ($value == NULL && $manual_inserted)
{
continue;
@ -845,6 +849,18 @@ class DocumentController extends Document
$oDB->rollback();
return $ev_output;
}
// Handle extra vars that support file upload.
if ($extra_item->type === 'file' && is_array($value))
{
$ev_output = $extra_item->uploadFile($value, $obj->document_srl, 'doc');
if (!$ev_output->toBool())
{
$oDB->rollback();
return $ev_output;
}
$value = $ev_output->get('file_srl');
}
}
$extra_vars[$extra_item->name] = $value;
@ -1168,7 +1184,10 @@ class DocumentController extends Document
$extra_vars = array();
if(Context::get('act')!='procFileDelete')
{
// Get a copy of current extra vars before deleting all existing data.
$old_extra_vars = DocumentModel::getExtraVars($obj->module_srl, $obj->document_srl);
$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
// Insert extra variables if the document successfully inserted.
$extra_keys = DocumentModel::getExtraKeys($obj->module_srl);
if(count($extra_keys))
@ -1179,7 +1198,11 @@ class DocumentController extends Document
if(isset($obj->{'extra_vars'.$idx}))
{
$tmp = $obj->{'extra_vars'.$idx};
if (is_array($tmp))
if ($extra_item->type === 'file')
{
$value = $tmp;
}
elseif (is_array($tmp))
{
$value = implode('|@|', $tmp);
}
@ -1193,19 +1216,68 @@ class DocumentController extends Document
$value = trim($obj->{$extra_item->name});
}
// Validate the extra value.
if ($value == NULL && $manual_updated)
// Validate and process the extra value.
if ($value == NULL && $manual_updated && $extra_item->type !== 'file')
{
continue;
}
else
{
// Check for required and strict values.
$ev_output = $extra_item->validate($value);
if ($ev_output && !$ev_output->toBool())
{
$oDB->rollback();
return $ev_output;
}
// Handle extra vars that support file upload.
if ($extra_item->type === 'file')
{
// New upload (replace old file)
if (is_array($value) && isset($value['name']))
{
if (isset($old_extra_vars[$idx]->value))
{
$fc_output = FileController::getInstance()->deleteFile($old_extra_vars[$idx]->value);
if (!$fc_output->toBool())
{
$oDB->rollback();
return $fc_output;
}
}
$ev_output = $extra_item->uploadFile($value, $obj->document_srl, 'doc');
if (!$ev_output->toBool())
{
$oDB->rollback();
return $ev_output;
}
$value = $ev_output->get('file_srl');
}
// Leave current file unchanged
elseif (!$value)
{
if (isset($old_extra_vars[$idx]->value))
{
$value = $old_extra_vars[$idx]->value;
}
}
// Delete current file
elseif (isset($obj->{'_delete_extra_vars'.$idx}) && $obj->{'_delete_extra_vars'.$idx} === 'Y')
{
if (isset($old_extra_vars[$idx]->value))
{
$fc_output = FileController::getInstance()->deleteFile($old_extra_vars[$idx]->value);
if (!$fc_output->toBool())
{
$oDB->rollback();
return $fc_output;
}
}
}
}
}
$extra_vars[$extra_item->name] = $value;
$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);

20
modules/extravar/models/Value.php
View file

@ -4,6 +4,7 @@ namespace Rhymix\Modules\Extravar\Models;
use BaseObject;
use Context;
use FileController;
use ModuleModel;
use Rhymix\Framework\DateTime;
use Rhymix\Framework\i18n;
@ -275,6 +276,25 @@ class Value
return null;
}
/**
* Upload a file.
*
* @param array $file
* @param int $target_srl
* @param string $target_type
* @return BaseObject
*/
public function uploadFile(array $file, int $target_srl, string $target_type): BaseObject
{
$oFileController = FileController::getInstance();
$output = $oFileController->insertFile($file, $this->module_srl, $target_srl);
if ($output->toBool())
{
$oFileController->setFilesValid($target_srl, "ev:$target_type", $output->get('file_srl'));
}
return $output;
}
/**
* Get the next temporary ID.
*