mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-03 16:51:40 +09:00
Display uploaded file name and link in extra vars section
This commit is contained in:
parent
50274a7f9b
commit
0398b64350
2 changed files with 26 additions and 9 deletions
|
|
@ -1256,14 +1256,6 @@ class DocumentController extends Document
|
|||
|
||||
$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')
|
||||
{
|
||||
|
|
@ -1277,6 +1269,14 @@ class DocumentController extends Document
|
|||
}
|
||||
}
|
||||
}
|
||||
// Leave current file unchanged
|
||||
elseif (!$value)
|
||||
{
|
||||
if (isset($old_extra_vars[$idx]->value))
|
||||
{
|
||||
$value = $old_extra_vars[$idx]->value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$extra_vars[$extra_item->name] = $value;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ namespace Rhymix\Modules\Extravar\Models;
|
|||
use BaseObject;
|
||||
use Context;
|
||||
use FileController;
|
||||
use FileHandler;
|
||||
use FileModel;
|
||||
use ModuleModel;
|
||||
use Rhymix\Framework\DateTime;
|
||||
use Rhymix\Framework\i18n;
|
||||
|
|
@ -450,7 +452,22 @@ class Value
|
|||
case 'timezone':
|
||||
return DateTime::getTimezoneList()[$value] ?? '';
|
||||
case 'file':
|
||||
return $value;
|
||||
if ($value)
|
||||
{
|
||||
$file = FileModel::getFile($value);
|
||||
if ($file)
|
||||
{
|
||||
return sprintf('<span><a href="%s">%s</a> (%s)</span>', $file->download_url, $file->source_filename, FileHandler::filesize($file->file_size));
|
||||
}
|
||||
else
|
||||
{
|
||||
return '';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return '';
|
||||
}
|
||||
default:
|
||||
return $value;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue