dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// bug fix on toolbar save button management

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10015 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-11-09 17:14:11 +00:00
parent 48df260f67
commit 5caa9752ba
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/toolbar.tpl
+7 -7
View File
@@ -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
controllers/admin/AdminSupplierOrdersController.php
+7
View File
@@ -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;