From 916d1fbaef3dd98fd10fffa52f4009d13fd77106 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Tue, 15 Nov 2011 21:57:11 +0000
Subject: [PATCH] // Fix added token in link of AdminQuickAccesses

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10152 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/header.tpl | 4 ++--
 install-dev/sql/db_settings_lite.sql | 3 ++-
 install-dev/sql/upgrade/1.5.0.1.sql  | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl
index 0f3e4d42e..3f0cc2929 100644
--- a/admin-dev/themes/template/header.tpl
+++ b/admin-dev/themes/template/header.tpl
@@ -227,8 +227,8 @@ $(document).ready(function()
 		{
 			var eltVal = $(elt).val();
 			if (eltVal == "0") return false;
-			else if (eltVal.substr(eltVal.length - 6) == "_blank") window.open(eltVal.substr(0, eltVal.length - 6), "_blank");
-			else location.href = eltVal;
+			else if (eltVal.substr(eltVal.length - 6) == "_blank") window.open(eltVal.substr(0, eltVal.length - 6)+'&token={$token}', "_blank");
+			else location.href = eltVal+'&token={$token}';
 		}
 		</script>
 		<select onchange="quickSelect(this);" id="quick_select">
diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql
index 11792e2b9..ac874017b 100644
--- a/install-dev/sql/db_settings_lite.sql
+++ b/install-dev/sql/db_settings_lite.sql
@@ -1101,7 +1101,8 @@ INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
 	FROM `PREFIX_lang` CROSS JOIN `PREFIX_tab`);
 
 INSERT INTO `PREFIX_quick_access` (`id_quick_access`, `link`, `new_window`) VALUES
-(1, 'index.php', 0),(2, '../', 1),(3, 'index.php?controller=AdminCatalog&addcategory', 0),(4, 'index.php?controller=AdminCatalog&addproduct', 0),(5, 'index.php?controller=AdminCartRules&addcart_rule', 0);
+(1, 'index.php', 0),(2, '../', 1),(3, 'index.php?controller=AdminCategories&addcategory', 0),
+(4, 'index.php?controller=AdminProducts&addproduct', 0),(5, 'index.php?controller=AdminCartRules&addcart_rule', 0);
 
 INSERT INTO `PREFIX_quick_access_lang` (`id_quick_access`, `id_lang`, `name`) VALUES
 (1, 1, 'Home'),(1, 2, 'Accueil'),(1, 3, 'Inicio'),(1, 4, 'Start'),(1, 5, 'Home page'),
diff --git a/install-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql
index 1567f37bd..2a992a5de 100644
--- a/install-dev/sql/upgrade/1.5.0.1.sql
+++ b/install-dev/sql/upgrade/1.5.0.1.sql
@@ -498,3 +498,6 @@ ALTER TABLE `PREFIX_hook` ADD `is_native` TINYINT( 1 ) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_tax` ADD COLUMN `account_number` VARCHAR(64) NOT NULL;
 
 /* PHP:add_new_tab(AdminAttributeGenerator, fr:Générateur de combinaisons|es:Combinations generator|en:Combinations generator|de:Combinations generator|it:Combinations generator, 1); */;
+
+UPDATE `PREFIX_quick_access` SET `link` = 'index.php?controller=AdminCategories&addcategory' WHERE `id_quick_access` = 3;
+UPDATE `PREFIX_quick_access` SET `link` = 'index.php?controller=AdminProducts&addproduct' WHERE `id_quick_access` = 4;
\ No newline at end of file