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

[-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong

Browse Source
This commit is contained in:
Jérôme Nadaud
2013-07-17 16:19:15 +02:00
parent 24b2e1ec8c
commit 6884d7c5de
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+5 -3
View File
@@ -2543,7 +2543,7 @@ class AdminProductsControllerCore extends AdminController
$this->tpl_form_vars['currentIndex'] = self::$currentIndex; $this->tpl_form_vars['currentIndex'] = self::$currentIndex;
$this->tpl_form_vars['display_multishop_checkboxes'] = (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP && $this->display == 'edit'); $this->tpl_form_vars['display_multishop_checkboxes'] = (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP && $this->display == 'edit');
$this->fields_form = array(''); $this->fields_form = array('');
$this->display = 'edit';
$this->tpl_form_vars['token'] = $this->token; $this->tpl_form_vars['token'] = $this->token;
$this->tpl_form_vars['combinationImagesJs'] = $this->getCombinationImagesJs(); $this->tpl_form_vars['combinationImagesJs'] = $this->getCombinationImagesJs();
$this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'); $this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL');
@@ -2573,8 +2573,8 @@ class AdminProductsControllerCore extends AdminController
$this->tpl_form_vars['upload_max_filesize'] = $upload_max_filesize; $this->tpl_form_vars['upload_max_filesize'] = $upload_max_filesize;
$this->tpl_form_vars['country_display_tax_label'] = $this->context->country->display_tax_label; $this->tpl_form_vars['country_display_tax_label'] = $this->context->country->display_tax_label;
$this->tpl_form_vars['has_combinations'] = $this->object->hasAttributes(); $this->tpl_form_vars['has_combinations'] = $this->object->hasAttributes();
$this->product_exists_in_shop = true; $this->product_exists_in_shop = true;
if ($this->display == 'edit' && Validate::isLoadedObject($product) && Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && !$product->isAssociatedToShop($this->context->shop->id)) if ($this->display == 'edit' && Validate::isLoadedObject($product) && Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && !$product->isAssociatedToShop($this->context->shop->id))
{ {
$this->product_exists_in_shop = false; $this->product_exists_in_shop = false;
@@ -2602,12 +2602,14 @@ class AdminProductsControllerCore extends AdminController
$this->initPack($this->object); $this->initPack($this->object);
$this->{'initForm'.$this->tab_display}($this->object); $this->{'initForm'.$this->tab_display}($this->object);
$this->tpl_form_vars['product'] = $this->object; $this->tpl_form_vars['product'] = $this->object;
if ($this->ajax) if ($this->ajax)
if (!isset($this->tpl_form_vars['custom_form'])) if (!isset($this->tpl_form_vars['custom_form']))
throw new PrestaShopException('custom_form empty for action '.$this->tab_display); throw new PrestaShopException('custom_form empty for action '.$this->tab_display);
else else
return $this->tpl_form_vars['custom_form']; return $this->tpl_form_vars['custom_form'];
} }
$parent = parent::renderForm(); $parent = parent::renderForm();
$this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch')); $this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch'));
return $parent; return $parent;
@@ -3490,7 +3492,7 @@ class AdminProductsControllerCore extends AdminController
$data->assign('languages', $this->_languages); $data->assign('languages', $this->_languages);
$data->assign('currency', $currency); $data->assign('currency', $currency);
$this->object = $product; $this->object = $product;
$this->display = 'edit'; //$this->display = 'edit';
$data->assign('product_name_redirected', Product::getProductName((int)$product->id_product_redirected, null, (int)$this->context->language->id)); $data->assign('product_name_redirected', Product::getProductName((int)$product->id_product_redirected, null, (int)$this->context->language->id));
/* /*
* Form for adding a virtual product like software, mp3, etc... * Form for adding a virtual product like software, mp3, etc...