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

// bug fix with suppliers and warehouses on product save action in back-office

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11286 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-12-15 17:36:54 +00:00
parent db959d2334
commit 9a58359cb6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/products/suppliers.tpl
+3 -3
View File
@@ -27,15 +27,15 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('input').keypress(function(e) { $('input').keypress(function(e) {
var code = null; var code = null;
code = (e.keyCode ? e.keyCode : e.which); code = (e.keyCode ? e.keyCode : e.which);
return (code == 13) ? false : true; return (code == 13) ? false : true;
}); });
}); });
</script> </script>
<input type="hidden" name="supplier_loaded" value="1">
{if isset($product->id)} {if isset($product->id)}
<h4>{l s='Suppliers of the current product'}</h4> <h4>{l s='Suppliers of the current product'}</h4>
admin-dev/themes/template/products/warehouses.tpl
+3 -3
View File
@@ -27,15 +27,15 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('input').keypress(function(e) { $('input').keypress(function(e) {
var code = null; var code = null;
code = (e.keyCode ? e.keyCode : e.which); code = (e.keyCode ? e.keyCode : e.which);
return (code == 13) ? false : true; return (code == 13) ? false : true;
}); });
}); });
</script> </script>
<input type="hidden" name="warehouse_loaded" value="1">
{if isset($product->id)} {if isset($product->id)}
<h4>{l s='Product location in warehouses'}</h4> <h4>{l s='Product location in warehouses'}</h4>
controllers/admin/AdminProductsController.php
+2 -2
View File
@@ -2078,7 +2078,7 @@ class AdminProductsControllerCore extends AdminController
*/ */
public function processSuppliers($token) public function processSuppliers($token)
{ {
if (Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) if (Tools::getValue('supplier_loaded') && Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product'))))
{ {
// Get all id_product_attribute // Get all id_product_attribute
$attributes = $product->getAttributesResume($this->context->language->id); $attributes = $product->getAttributesResume($this->context->language->id);
@@ -2256,7 +2256,7 @@ class AdminProductsControllerCore extends AdminController
*/ */
public function processWarehouses($token) public function processWarehouses($token)
{ {
if (Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) if (Tools::getValue('warehouse_loaded') && Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product'))))
{ {
// Get all id_product_attribute // Get all id_product_attribute
$attributes = $product->getAttributesResume($this->context->language->id); $attributes = $product->getAttributesResume($this->context->language->id);