From 5caa9752baffd56b85399f242f78e0e0cd5bc28e Mon Sep 17 00:00:00 2001
From: dSevere <denis.severe@prestashop.com>
Date: Wed, 9 Nov 2011 17:14:11 +0000
Subject: [PATCH] // bug fix on toolbar save button management

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

diff --git a/admin-dev/themes/template/toolbar.tpl b/admin-dev/themes/template/toolbar.tpl
index b33ce54ea..d5ce7b540 100644
--- a/admin-dev/themes/template/toolbar.tpl
+++ b/admin-dev/themes/template/toolbar.tpl
@@ -40,19 +40,19 @@
 			//get reference on save link
 			btn_save = $('span[class~="process-icon-save"]').parent();
 
-			if (btn_save.length > 0)
+			//get reference on form submit button
+			btn_submit = $('#{$table}_form_submit_btn');
+
+			if (btn_save.length > 0 && btn_submit.length > 0)
 			{
 				//get reference on save and stay link
 				btn_save_and_stay = $('span[class~="process-icon-save-and-stay"]').parent();
 
-				//get reference on form submit button
-				btn_submit = $('#{$table}_form_submit_btn');
-
 				//get reference on current save link label
 				lbl_save = $('#desc-{$table}-save div');
 
 				//override save link label with submit button value
-				if (btn_submit.attr("value").length > 0)
+				if (btn_submit.val().length > 0)
 					lbl_save.html(btn_submit.attr("value"));
 
 				if (btn_save_and_stay.length > 0)
@@ -61,8 +61,8 @@
 					lbl_save_and_stay = $('#desc-{$table}-save-and-stay div');
 
 					//override save and stay link label with submit button value
-					if (btn_submit.attr("value").length > 0)
-						lbl_save_and_stay.html(btn_submit.attr("value") + ' and stay');
+					if (btn_submit.val().length > 0)
+						lbl_save_and_stay.html(btn_submit.val() + ' and stay');
 				}
 
 				//hide standard submit button
diff --git a/controllers/admin/AdminSupplierOrdersController.php b/controllers/admin/AdminSupplierOrdersController.php
index 0777a0f51..ef21e049b 100644
--- a/controllers/admin/AdminSupplierOrdersController.php
+++ b/controllers/admin/AdminSupplierOrdersController.php
@@ -564,6 +564,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 		}
 
 		$supplier_order = new SupplierOrder($id_supplier_order);
+
 		if (!Validate::isLoadedObject($supplier_order))
 		{
 			$this->_errors[] = Tools::displayError($this->l('The specified supplier order is not valid'));
@@ -652,6 +653,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 		if ($id_supplier_order != null)
 		{
 			$supplier_order = new SupplierOrder($id_supplier_order);
+
 			$currency = new Currency($supplier_order->id_currency);
 
 			if (Validate::isLoadedObject($supplier_order))
@@ -715,6 +717,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 			return parent::initContent();
 
 		$supplier_order = new SupplierOrder($id_supplier_order);
+
 		// if it's not a valid order
 		if (!Validate::isLoadedObject($supplier_order))
 			return parent::initContent();
@@ -889,6 +892,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 		if ($id_supplier_order != null)
 		{
 			$supplier_order = new SupplierOrder($id_supplier_order);
+
 			$products_already_in_order = $supplier_order->getEntries();
 			$currency = new Currency($supplier_order->id_ref_currency);
 
@@ -1068,6 +1072,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 			{
 				// try to load supplier order
 				$supplier_order = new SupplierOrder($id_supplier_order);
+
 				if (Validate::isLoadedObject($supplier_order))
 				{
 					// get valid available possible states for this order
@@ -1143,6 +1148,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 		{
 			$supplier_order_detail = new SupplierOrderDetail($id_supplier_order_detail);
 			$supplier_order = new SupplierOrder((int)Tools::getValue('id_supplier_order'));
+
 			if (Validate::isLoadedObject($supplier_order_detail) && Validate::isLoadedObject($supplier_order))
 			{
 				// checks if quantity is valid
@@ -1610,6 +1616,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 	public function printPDFIcons($id_supplier_order, $tr)
 	{
 		$supplier_order = new SupplierOrder((int)$id_supplier_order);
+
 		if (!Validate::isLoadedObject($supplier_order))
 			return;