From cf44f8d0b4959028f68baa696a6ac0179f75c2e5 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Mon, 4 Nov 2013 19:50:04 +0100
Subject: [PATCH] // Uploader helper small fix

---
 .../default/template/helpers/uploader/simple.tpl   |  4 ++--
 classes/helper/HelperForm.php                      | 11 ++++++++++-
 classes/helper/HelperOptions.php                   |  9 +++++++++
 classes/helper/HelperUploader.php                  | 14 +-------------
 install-dev/data/xml/hook.xml                      |  3 +++
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/uploader/simple.tpl b/admin-dev/themes/default/template/helpers/uploader/simple.tpl
index 81f40aa73..e5f386a5a 100644
--- a/admin-dev/themes/default/template/helpers/uploader/simple.tpl
+++ b/admin-dev/themes/default/template/helpers/uploader/simple.tpl
@@ -60,8 +60,8 @@
 				<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}
 				</button>
-				{if (!isset($multiple) || !$multiple) && isset($file)}
-				<a href="{$file}">
+				{if (!isset($multiple) || !$multiple) && isset($files) && $files|count == 1 && isset($files[0].download_url)}
+				<a href="{$files[0].download_url}">
 					<button type="button" class="btn btn-default">
 						<i class="icon-cloud-download"></i>
 						{if isset($size)}{l s='Download current file (%skb)' sprintf=$size}{else}{l s='Download current file'}{/if}
diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index 7fc0f2530..f406e2ee9 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -130,8 +130,17 @@ class HelperFormCore extends Helper
 									'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->setFile(isset($params['file'])?$params['file']:null);
 							$uploader->setTitle(isset($params['title'])?$params['title']:null);
 
 							$params['file'] = $uploader->render();
diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php
index 859cebb8c..2a4b142d9 100644
--- a/classes/helper/HelperOptions.php
+++ b/classes/helper/HelperOptions.php
@@ -116,6 +116,15 @@ class HelperOptionsCore extends Helper
 							'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->setTitle(isset($field['title'])?$field['title']:null);
 					$field['file'] = $uploader->render();
diff --git a/classes/helper/HelperUploader.php b/classes/helper/HelperUploader.php
index 8e9f1bac7..276f08ba3 100644
--- a/classes/helper/HelperUploader.php
+++ b/classes/helper/HelperUploader.php
@@ -31,6 +31,7 @@ class HelperUploaderCore extends Uploader
 	const DEFAULT_AJAX_TEMPLATE      = 'ajax.tpl';
 
 	const TYPE_IMAGE                 = 'image';
+	const TYPE_FILE                  = 'file';
 
 	private   $_context;
 	private   $_id;
@@ -38,7 +39,6 @@ class HelperUploaderCore extends Uploader
 	private   $_name;
 	private   $_max_files;
 	private   $_multiple;
-	private   $_file;
 	protected $_template;
 	private   $_template_directory;
 	private   $_title;
@@ -182,17 +182,6 @@ class HelperUploaderCore extends Uploader
 			return $this->getTemplateDirectory().$template;
 	}
 
-	public function setFile($value)
-	{
-		$this->_file = $value;
-		return $this;
-	}
-
-	public function getFile()
-	{
-		return $this->_file;
-	}
-
 	public function setTitle($value)
 	{
 		$this->_title = $value;
@@ -290,7 +279,6 @@ class HelperUploaderCore extends Uploader
 			'multiple'      => $this->isMultiple(),
 			'files'         => $this->getFiles(),
 			'thumb'         => $this->getThumb(),
-			'file'          => $this->getFile(),
 			'title'         => $this->getTitle(),
 			'max_files'     => (isset($max_files) && $max_files > 0) ? ($max_files-count($this->getFiles())) : $max_files
 		));
diff --git a/install-dev/data/xml/hook.xml b/install-dev/data/xml/hook.xml
index cd26919da..ae69c546c 100644
--- a/install-dev/data/xml/hook.xml
+++ b/install-dev/data/xml/hook.xml
@@ -286,5 +286,8 @@
      <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>
     </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>
 </entity_hook>