From 8d593239e37a9eb3c8b4dfd9bf1038bf81ceeb53 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Fri, 16 Dec 2011 16:03:44 +0000
Subject: [PATCH] [-] BO : #PSTEST-18 : smalls improvements

---
 .../themes/template/products/associations.tpl | 22 +++++++++----------
 controllers/admin/AdminProductsController.php |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/template/products/associations.tpl b/admin-dev/themes/template/products/associations.tpl
index 846054e80..799f872fe 100644
--- a/admin-dev/themes/template/products/associations.tpl
+++ b/admin-dev/themes/template/products/associations.tpl
@@ -43,6 +43,17 @@
 		{l s='Please check a category in order to select the default category.'}
 	</div>
 	<table>
+		<tr>
+			<td class="col-left">
+				<label for="category_block">{l s='Associated categories:'}</label>
+			</td>
+			<td class="col-right">
+				<div id="category_block">{$category_tree}</div>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">&nbsp;</td>
+		</tr>
 		<tr>
 			<td class="col-left">
 				<label for="id_category_default">{l s='Default category:'}</label>
@@ -56,17 +67,6 @@
 			</td>
 		</tr>
 	</table>
-	<br />
-	<table>
-		<tr>
-			<td class="col-left">
-				<label for="category_block">{l s='Associated categories:'}</label>
-			</td>
-			<td class="col-right">
-				<div id="category_block">{$category_tree}</div>
-			</td>
-		</tr>
-	</table>
 	{if $feature_shop_active}
 		<div class="separation"></div>
 		{* @todo use asso_shop from Helper *}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 012d62507..5fd9652d1 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -633,7 +633,7 @@ class AdminProductsControllerCore extends AdminController
 					if (!empty($is_virtual))
 						Product::updateIsVirtual($product->id);
 
-					$this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=3&token='.($token ? $token : $this->token);
+					$this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&action=Combinations&token='.($token ? $token : $this->token);
 				}
 			}
 		}