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

[-] FO : fix #PSCFV-548 - when ordering out of stock downloadable product, the download is not available in order history

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15174 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-05-10 13:54:05 +00:00
parent 8a766fb104
commit cf002df6f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+2 -2
View File
@@ -1026,7 +1026,7 @@ class AdminProductsControllerCore extends AdminController
if (!$this->action) if (!$this->action)
parent::initProcess(); parent::initProcess();
if ($this->action == 'save' || $this->action == 'new' && isset($this->available_tabs[Tools::getValue('key_tab')])) if (isset($this->available_tabs[Tools::getValue('key_tab')]))
$this->tab_display = Tools::getValue('key_tab'); $this->tab_display = Tools::getValue('key_tab');
// Set tab to display if not decided already // Set tab to display if not decided already
@@ -1452,7 +1452,7 @@ class AdminProductsControllerCore extends AdminController
if ($this->display == 'edit') if ($this->display == 'edit')
$this->redirect_after = self::$currentIndex.'&id_product='.(int)$this->object->id $this->redirect_after = self::$currentIndex.'&id_product='.(int)$this->object->id
.(Tools::getIsset('id_category') ? '&id_category='.(int)Tools::getValue('id_category') : '') .(Tools::getIsset('id_category') ? '&id_category='.(int)Tools::getValue('id_category') : '')
.'&addproduct&conf=3&key_tab='.Tools::safeOutput(Tools::getValue('key_tab')).'&token='.$this->token; .'&updateproduct&conf=3&key_tab='.Tools::safeOutput(Tools::getValue('key_tab')).'&token='.$this->token;
else else
// Default behavior (save and back) // Default behavior (save and back)
$this->redirect_after = self::$currentIndex $this->redirect_after = self::$currentIndex