From 675ee2152c0f058940b95d6aaef4c70e8dd67904 Mon Sep 17 00:00:00 2001
From: mBertholino <mathieu.bertholino@prestashop.com>
Date: Wed, 28 Dec 2011 14:44:55 +0000
Subject: [PATCH] [-] BO : #PSTEST-230 : bug fixed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11849 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/toolbar.tpl         | 2 +-
 controllers/admin/AdminProductsController.php | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/template/toolbar.tpl b/admin-dev/themes/template/toolbar.tpl
index cb3eb92d3..067526dc4 100644
--- a/admin-dev/themes/template/toolbar.tpl
+++ b/admin-dev/themes/template/toolbar.tpl
@@ -28,7 +28,7 @@
 	<ul class="cc_button">
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
-				<a id="desc-{$table}-{$btn.imgclass|default:$k}" class="toolbar_btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}>
+				<a id="desc-{$table}-{$btn.imgclass|default:$k}" class="toolbar_btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
 					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>
 					<div>{$btn.desc}</div>
 				</a>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 4bd05ce3c..2d8b2280b 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2030,9 +2030,10 @@ class AdminProductsControllerCore extends AdminController
 					if ($this->tabAccess['add'] && $this->display != 'add')
 						$this->toolbar_btn['duplicate'] = array(
 							'short' => 'Duplicate',
-							'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id,
+							//'href' => $this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id.'&amp;duplicateproduct',
 							'desc' => $this->l('Duplicate'),
-							'confirm' => 1
+							'confirm' => 1,
+							'js' => 'if (confirm(\''.$this->l('Also copy images ?').'\')) document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id.'&amp;duplicateproduct\'; else document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id.'&amp;duplicateproduct&amp;noimage=\';'
 						);
 
 					// adding button for preview this product
@@ -2065,13 +2066,13 @@ class AdminProductsControllerCore extends AdminController
 				{
 					$this->toolbar_btn['save'] = array(
 						'short' => 'Save',
-						'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id,
+						'href' => '#',
 						'desc' => $this->l('Save'),
 					);
 
 					$this->toolbar_btn['save-and-stay'] = array(
 						'short' => 'SaveAndStay',
-						'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id,
+						'href' => '#',
 						'desc' => $this->l('Save and stay'),
 					);
 				}