dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
This commit is contained in:
Damien Metzger
2013-10-25 18:58:07 +02:00
parent 03857c0576 8b1f9d0560
commit 39f6a2354a
14 changed files with 238 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperUploader.php
+9 -46
View File
@@ -31,13 +31,10 @@ class HelperUploaderCore extends Uploader
const DEFAULT_AJAX_TEMPLATE = 'ajax.tpl';
private $_context;
private $_delete_url;
private $_display_image;
private $_id;
private $_image;
private $_images;
private $_name;
private $_multiple;
private $_size;
private $_file;
protected $_template;
private $_template_directory;
@@ -60,23 +57,6 @@ class HelperUploaderCore extends Uploader
return $this->_context;
}
public function setDeleteUrl($value)
{
$this->_delete_url = $value;
return $this;
}
public function getDeleteUrl()
{
return $this->_delete_url;
}
public function setDisplayImage($value)
{
$this->_display_image = $value;
return $this;
}
public function setId($value)
{
$this->_id = (string)$value;
@@ -91,15 +71,18 @@ class HelperUploaderCore extends Uploader
return $this->_id;
}
public function setImage($value)
public function setImages($value)
{
$this->_image = $value;
$this->_images = $value;
return $this;
}
public function getImage()
public function getImages()
{
return $this->_image;
if (!isset($this->_images))
$this->_images = array();
return $this->_images;
}
public function setName($value)
@@ -119,17 +102,6 @@ class HelperUploaderCore extends Uploader
return $this;
}
public function setSize($value)
{
$this->_size = $value;
return $this;
}
public function getSize()
{
return $this->_size;
}
public function setTemplate($value)
{
$this->_template = $value;
@@ -246,11 +218,6 @@ class HelperUploaderCore extends Uploader
return $this;
}
public function displayImage()
{
return (isset($this->_display_image) && $this->_display_image);
}
public function isMultiple()
{
return (isset($this->_multiple) && $this->_multiple);
@@ -297,7 +264,6 @@ class HelperUploaderCore extends Uploader
$this->getContext()->controller->addJs(__PS_BASE_URI__.'/js/vendor/spin.js');
$this->getContext()->controller->addJs(__PS_BASE_URI__.'/js/vendor/ladda.js');
}
if ($this->useAjax())
@@ -312,12 +278,9 @@ class HelperUploaderCore extends Uploader
'name' => $this->getName(),
'url' => $this->getUrl(),
'multiple' => $this->isMultiple(),
'display_image' => $this->displayImage(),
'image' => $this->getImage(),
'images' => $this->getImages(),
'thumb' => $this->getThumb(),
'file' => $this->getFile(),
'size' => $this->getSize(),
'delete_url' => $this->getDeleteUrl(),
'title' => $this->getTitle()
));