// Uploader helper small fix

This commit is contained in:
Jerome Nadaud
2013-11-04 19:50:04 +01:00
parent fa68e015b3
commit cf44f8d0b4
5 changed files with 25 additions and 16 deletions
@@ -60,8 +60,8 @@
<button id="{$id}-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default"> <button id="{$id}-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
<i class="icon-folder-open"></i> {if isset($multiple) && $multiple}{l s='Add files'}{else}{l s='Add file'}{/if} <i class="icon-folder-open"></i> {if isset($multiple) && $multiple}{l s='Add files'}{else}{l s='Add file'}{/if}
</button> </button>
{if (!isset($multiple) || !$multiple) && isset($file)} {if (!isset($multiple) || !$multiple) && isset($files) && $files|count == 1 && isset($files[0].download_url)}
<a href="{$file}"> <a href="{$files[0].download_url}">
<button type="button" class="btn btn-default"> <button type="button" class="btn btn-default">
<i class="icon-cloud-download"></i> <i class="icon-cloud-download"></i>
{if isset($size)}{l s='Download current file (%skb)' sprintf=$size}{else}{l s='Download current file'}{/if} {if isset($size)}{l s='Download current file (%skb)' sprintf=$size}{else}{l s='Download current file'}{/if}
+10 -1
View File
@@ -130,8 +130,17 @@ class HelperFormCore extends Helper
'delete_url' => isset($params['delete_url'])?$params['delete_url']:null 'delete_url' => isset($params['delete_url'])?$params['delete_url']:null
))); )));
if (isset($params['file']) && $params['file']) // Use for retrocompatibility
$uploader->setFiles(array(
0 => array(
'type' => HelperUploader::TYPE_FILE,
'size' => isset($params['size'])?$params['size']:null,
'delete_url' => isset($params['delete_url'])?$params['delete_url']:null,
'download_url' => isset($params['file'])?$params['file']:null
)));
$uploader->setThumb(isset($params['thumb'])?$params['thumb']:null); $uploader->setThumb(isset($params['thumb'])?$params['thumb']:null);
$uploader->setFile(isset($params['file'])?$params['file']:null);
$uploader->setTitle(isset($params['title'])?$params['title']:null); $uploader->setTitle(isset($params['title'])?$params['title']:null);
$params['file'] = $uploader->render(); $params['file'] = $uploader->render();
+9
View File
@@ -116,6 +116,15 @@ class HelperOptionsCore extends Helper
'delete_url' => isset($field['delete_url'])?$field['delete_url']:null 'delete_url' => isset($field['delete_url'])?$field['delete_url']:null
))); )));
if (isset($field['file']) && $field['file']) // Use for retrocompatibility
$uploader->setFiles(array(
0 => array(
'type' => HelperUploader::TYPE_FILE,
'size' => isset($field['size'])?$field['size']:null,
'delete_url' => isset($field['delete_url'])?$field['delete_url']:null,
'download_url' => isset($field['file'])?$field['file']:null
)));
$uploader->setThumb(isset($field['thumb'])?$field['thumb']:null); $uploader->setThumb(isset($field['thumb'])?$field['thumb']:null);
$uploader->setTitle(isset($field['title'])?$field['title']:null); $uploader->setTitle(isset($field['title'])?$field['title']:null);
$field['file'] = $uploader->render(); $field['file'] = $uploader->render();
+1 -13
View File
@@ -31,6 +31,7 @@ class HelperUploaderCore extends Uploader
const DEFAULT_AJAX_TEMPLATE = 'ajax.tpl'; const DEFAULT_AJAX_TEMPLATE = 'ajax.tpl';
const TYPE_IMAGE = 'image'; const TYPE_IMAGE = 'image';
const TYPE_FILE = 'file';
private $_context; private $_context;
private $_id; private $_id;
@@ -38,7 +39,6 @@ class HelperUploaderCore extends Uploader
private $_name; private $_name;
private $_max_files; private $_max_files;
private $_multiple; private $_multiple;
private $_file;
protected $_template; protected $_template;
private $_template_directory; private $_template_directory;
private $_title; private $_title;
@@ -182,17 +182,6 @@ class HelperUploaderCore extends Uploader
return $this->getTemplateDirectory().$template; return $this->getTemplateDirectory().$template;
} }
public function setFile($value)
{
$this->_file = $value;
return $this;
}
public function getFile()
{
return $this->_file;
}
public function setTitle($value) public function setTitle($value)
{ {
$this->_title = $value; $this->_title = $value;
@@ -290,7 +279,6 @@ class HelperUploaderCore extends Uploader
'multiple' => $this->isMultiple(), 'multiple' => $this->isMultiple(),
'files' => $this->getFiles(), 'files' => $this->getFiles(),
'thumb' => $this->getThumb(), 'thumb' => $this->getThumb(),
'file' => $this->getFile(),
'title' => $this->getTitle(), 'title' => $this->getTitle(),
'max_files' => (isset($max_files) && $max_files > 0) ? ($max_files-count($this->getFiles())) : $max_files 'max_files' => (isset($max_files) && $max_files > 0) ? ($max_files-count($this->getFiles())) : $max_files
)); ));
+3
View File
@@ -286,5 +286,8 @@
<hook id="actionBackOfficeCategory" live_edit="0"> <hook id="actionBackOfficeCategory" live_edit="0">
<name>actionBackOfficeCategory</name><title>Process new elements in the Back Office, tab AdminCategories</title><description>This hook process modules when the AdminCategories tab is displayed in the Back Office</description> <name>actionBackOfficeCategory</name><title>Process new elements in the Back Office, tab AdminCategories</title><description>This hook process modules when the AdminCategories tab is displayed in the Back Office</description>
</hook> </hook>
<hook id="actionBackOfficeCategoryRemoveThumbnail" live_edit="0">
<name>actionBackOfficeCategoryRemoveThumbnail</name><title>Delete elements in the Back Office, tab AdminCategories</title><description>This hook process modules when the AdminCategories tab call delete thumbnail</description>
</hook>
</entities> </entities>
</entity_hook> </entity_hook>