From 64ab7ed8a6e90315953cb66ca900b5f342f406de Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 14 Dec 2011 09:16:29 +0000
Subject: [PATCH] // fixed bug javascript for upload image in
 AdminProductsController

---
 admin-dev/themes/template/products/informations.tpl | 2 +-
 controllers/admin/AdminProductsController.php       | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index 00aa273ac..da6c2b03a 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -372,7 +372,7 @@ var textFieldLabel = 0;
 									<a style="cursor:pointer" class="button"
 									onmousedown="updateFriendlyURLByName();">{l s='Generate'}</a>&nbsp;{l s='Friendly-url from product\'s name.'}<br /><br />
 								{l s='Product link will look like this:'}
-								{if $ps_ssl_enabled}https://{else}http://{/if}{*$smarty.server.SERVER_NAME*}/<b>id_product</b>-<span id="friendly-url"></span>.html</p>
+								{if $ps_ssl_enabled}https://{else}http://{/if}{$smarty.server.SERVER_NAME}{$smarty.const.__PS_BASE_URI__}<b>{if isset($product->id)}{$product->id}{else}id_product{/if}</b>-<span id="friendly-url"></span>.html</p>
 									</td>
 								</tr>
 		</td></tr></table>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 7e0e82295..b8f806622 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2973,7 +2973,6 @@ class AdminProductsControllerCore extends AdminController
 
 		$product->tags = Tag::getProductTags($product->id);
 		
-		
 		$data->assign('tabs_preloaded', $this->tabs_preloaded);
 
 		// TinyMCE
@@ -3706,7 +3705,6 @@ class AdminProductsControllerCore extends AdminController
 			$this->addJqueryUI(array(
 				'ui.core',
 				'ui.widget',
-				'ui.progressbar',
 				'ui.accordion'
 			));
 
@@ -3721,7 +3719,8 @@ class AdminProductsControllerCore extends AdminController
 				_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.js',
 				_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js',
 				_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js',
-				_PS_JS_DIR_.'admin-categories-tree.js'
+				_PS_JS_DIR_.'admin-categories-tree.js',
+				_PS_JS_DIR_.'/jquery/ui/jquery.ui.progressbar.min.js'
 			));
 		}
 	}