diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 8abf8ddee..8430bd188 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -432,9 +432,9 @@ if (Tools::getValue('submitPublishProduct')) if (Tools::getIsset('id_product')) { $id_product = (int)(Tools::getValue('id_product')); - $id_tab_catalog = (int)(Tab::getIdFromClassName('AdminCatalog')); - $token = Tools::getAdminToken('AdminCatalog'.(int)($id_tab_catalog).(int)$context->employee->id); - $bo_product_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminCatalog&id_product='.$id_product.'&updateproduct&token='.$token; + $id_tab_catalog = (int)(Tab::getIdFromClassName('AdminProducts')); + $token = Tools::getAdminToken('AdminProducts'.(int)($id_tab_catalog).(int)$context->employee->id); + $bo_product_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminProducts&id_product='.$id_product.'&updateproduct&token='.$token; if (Tools::getValue('redirect')) die($bo_product_url); diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl index 93bd0a461..a00281ba4 100644 --- a/admin-dev/themes/template/products/form.tpl +++ b/admin-dev/themes/template/products/form.tpl @@ -268,7 +268,7 @@ $(document).ready(function(){

- {l s='Your product will be saved as draft'} + {l s='Your product will be saved as draft'} {l s='Save and preview'}
diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl index 0d4c905bc..0b0875ad2 100644 --- a/admin-dev/themes/template/products/informations.tpl +++ b/admin-dev/themes/template/products/informations.tpl @@ -138,7 +138,7 @@ {l s='Enabled'}
active}checked="checked"{/if} /> - + {if $feature_shop_active} diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index c5b6e76be..e2023e818 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1288,13 +1288,15 @@ class AdminProductsControllerCore extends AdminController $preview_url .= 'adtoken='.$token.'&ad='.$admin_dir; } $this->redirect_after = $preview_url; - } else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') || ($id_image && $id_image !== true)) // Save and stay on same form - // Save and stay on same form + } + else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') || ($id_image && $id_image !== true)) // Save and stay on same form + {// Save and stay on same form if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) $this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=4&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token); // Default behavior (save and back) $this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=4&token='.($token ? $token : $this->token); + } } } else @@ -1595,8 +1597,6 @@ class AdminProductsControllerCore extends AdminController if (empty($this->action)) $this->action = 'Informations'; - - if(method_exists($this, 'initForm'.$this->action)) $this->tpl_form = 'products/'.strtolower($this->action).'.tpl'; @@ -1649,7 +1649,7 @@ class AdminProductsControllerCore extends AdminController if ($id_category = (int)Tools::getValue('id_category')) self::$currentIndex .= '&id_category='.$id_category; $this->getList($this->context->language->id, !$this->context->cookie->__get($this->table.'Orderby') ? 'position' : null, !$this->context->cookie->__get($this->table.'Orderway') ? 'ASC' : null, 0, null, $this->context->shop->getID(true)); - + if (!empty($this->_list)) { $id_category = Tools::getValue('id_category', 1); @@ -1660,19 +1660,19 @@ class AdminProductsControllerCore extends AdminController $root_categ = Category::getRootCategory(); $children = $root_categ->getAllChildren(); $category_tree = array(); - + // Add category "all products" to tree $all_categ = new Category(); $all_categ->name = 'All products'; $all_categ->selected = $this->_category->id_category == $all_categ->id; $all_categ->dashes = ''; $category_tree[] = $all_categ; - + // Add root category to tree $root_categ->selected = $this->_category->id_category == $root_categ->id; $root_categ->dashes = str_repeat(' - ',$root_categ->level_depth); $category_tree[] = $root_categ; - + foreach ($children as $k => $categ) { $categ = new Category($categ['id_category'],$this->context->language->id); @@ -1681,7 +1681,7 @@ class AdminProductsControllerCore extends AdminController $category_tree[] = $categ; } $this->tpl_list_vars['category_tree'] = $category_tree; - + // used to build the new url when changing category $this->tpl_list_vars['base_url'] = preg_replace('#&id_category=[0-9]*#', '', self::$currentIndex).'&token='.$this->token; } @@ -1779,7 +1779,6 @@ class AdminProductsControllerCore extends AdminController $content = '

- '.$this->l('Your product will be saved as draft').' '.$this->l('Save and preview').' diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 71d4965a1..45c2fb863 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -87,7 +87,7 @@ class ProductControllerCore extends FrontController */ if (!$this->product->isAssociatedToShop() || ((!$this->product->active && ((Tools::getValue('adtoken') != Tools::encrypt('PreviewProduct'.$this->product->id)) - || !file_exists(dirname(__FILE__).'/../'.Tools::getValue('ad').'/ajax.php'))))) + || !file_exists(_PS_ROOT_DIR_.'/'.Tools::getValue('ad').'/ajax.php'))))) { header('HTTP/1.1 404 page not found'); $this->errors[] = Tools::displayError('Product is no longer available.'); diff --git a/js/admin.js b/js/admin.js index 29994cafe..8109104ed 100644 --- a/js/admin.js +++ b/js/admin.js @@ -865,7 +865,7 @@ function showOptions(show) function submitAddProductAndPreview() { $('#fakeSubmitAddProductAndPreview').attr('name','submitAddProductAndPreview'); - $('#product').submit(); + $('#product_form').submit(); } function submitAddcmsAndPreview()