From 936817999c9f6b271ae7efc2c12392072eed581f Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Mon, 3 Dec 2012 10:25:35 +0100 Subject: [PATCH 1/4] [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 --- modules/blocksearch/blocksearch.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/blocksearch/blocksearch.css b/modules/blocksearch/blocksearch.css index 261b96752..366badad9 100644 --- a/modules/blocksearch/blocksearch.css +++ b/modules/blocksearch/blocksearch.css @@ -26,3 +26,15 @@ height: 25px; } +form#searchbox{padding-top:5px} +form#searchbox label{color:#333;margin-bottom:1px} +form#searchbox input#search_query_block{ + border: 1px solid #CCCCCC; + -webkit-border-radius:3px !important; + -moz-border-radius:3px !important; + border-radius:3px !important; + height: 18px; + margin-top:10px; +} +form#searchbox input#search_button{padding: 1px 4px;} + From 088cb759f03ee21648f605ea3f02ddad395dc26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 10:44:32 +0100 Subject: [PATCH 2/4] [-] FO: js was missing on order follow #PSCFV-5441 --- controllers/front/OrderFollowController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index 2ac6a39cc..db270da14 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -113,7 +113,7 @@ class OrderFollowControllerCore extends FrontController parent::setMedia(); $this->addCSS(array(_THEME_CSS_DIR_.'history.css', _THEME_CSS_DIR_.'addresses.css')); $this->addJqueryPlugin('scrollTo'); - $this->addJS(_THEME_JS_DIR_.'history.js', _THEME_JS_DIR_.'tools.js'); + $this->addJS(array(_THEME_JS_DIR_.'history.js', _THEME_JS_DIR_.'tools.js')); } } From 4a106e51bb82b00ec80c44d3aeb9432123d2e6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 11:25:59 +0100 Subject: [PATCH 3/4] [-] BO: Fix category association in global context #PSCFV-5551 --- classes/Product.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 8af855564..480757db4 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -798,7 +798,7 @@ class ProductCore extends ObjectModel SELECT c.`id_category` FROM `'._DB_PREFIX_.'category_product` cp LEFT JOIN `'._DB_PREFIX_.'category` c ON (c.`id_category` = cp.`id_category`) - '.Shop::addSqlAssociation('category', 'c', true).' + '.Shop::addSqlAssociation('category', 'c', true, null, true).' WHERE cp.`id_category` NOT IN ('.implode(',', array_map('intval', $categories)).') AND cp.id_product = '.$this->id ); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index ae2b93f8d..13cd6a4db 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1704,7 +1704,7 @@ class AdminProductsControllerCore extends AdminController $this->updateDownloadProduct($object, 1); $this->updateTags(Language::getLanguages(false), $object); - if ($this->isProductFieldUpdated('category_box') && !$object->updateCategories(Tools::getValue('categoryBox'), true)) + if ($this->isProductFieldUpdated('category_box') && !$object->updateCategories(Tools::getValue('categoryBox'))) $this->errors[] = Tools::displayError('An error occurred while linking object.').' '.$this->table.' '.Tools::displayError('To categories'); } From 428c1fa99b3b38133acaa290a1d45f31b39f5800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 12:26:27 +0100 Subject: [PATCH 4/4] [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image --- classes/Image.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/classes/Image.php b/classes/Image.php index 0f56d1295..75c0a7f52 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -409,9 +409,8 @@ class ImageCore extends ObjectModel // Delete auto-generated images $image_types = ImageType::getImagesTypes(); foreach ($image_types as $image_type) - { $files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-'.$image_type['name'].'.'.$this->image_format; - } + // Delete watermark image $files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-watermark.'.$this->image_format; // delete index.php @@ -533,11 +532,11 @@ class ImageCore extends ObjectModel if (!file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder())) { // Apparently sometimes mkdir cannot set the rights, and sometimes chmod can't. Trying both. - $success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true) - || @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights); + $success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true); + $chmod = @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights); // Create an index.php file in the new folder - if ($success + if (($success || $chmod) && !file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php') && file_exists($this->source_index)) return @copy($this->source_index, _PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php');