TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #579 from Flynsarmy/nestedFileUpload 

Refs #485, #504 - Allow adding nested FileUpload files
This commit is contained in:
Samuel Georges 2014-09-06 21:40:49 +10:00
parent 37e5894df2 4df7af076d
commit fa0ada51c6
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/backend/formwidgets/FileUpload.php
View File

@ -1,5 +1,6 @@
<?php namespace Backend\FormWidgets;
use Str;
use Input;
use Validator;
use System\Models\File;
@ -63,10 +64,24 @@ class FileUpload extends FormWidgetBase
$this->vars['imageWidth'] = $this->imageWidth;
}
protected function getColumn()
{
$model = $this->model;
$columnName = $this->columnName;
$relations = Str::evalHtmlArray($columnName);
$last_relation = array_pop($relations);
while ( $relations )
{
$relation = array_shift($relations);
$model = $model->$relation;
}
return $model->$last_relation();
}
protected function getFileList()
{
$columnName = $this->columnName;
$list = $this->model->$columnName()->withDeferred($this->sessionKey)->orderBy('sort_order')->get();
$list = $this->getColumn()->withDeferred($this->sessionKey)->orderBy('sort_order')->get();
/*
* Set the thumb for each file
@ -97,8 +112,7 @@ class FileUpload extends FormWidgetBase
public function onRemoveAttachment()
{
if (($file_id = post('file_id')) && ($file = File::find($file_id))) {
$columnName = $this->columnName;
$this->model->$columnName()->remove($file, $this->sessionKey);
$this->getColumn()->remove($file, $this->sessionKey);
}
}
@ -189,8 +203,7 @@ class FileUpload extends FormWidgetBase
if (!$uploadedFile->isValid())
throw new SystemException('File is not valid');
$columnName = $this->columnName;
$fileRelation = $this->model->$columnName();
$fileRelation = $this->getColumn();
$file = new File();
$file->data = $uploadedFile;