From 4e42a7fa2aaf74bd2fa51c83f811449ef40a94ee Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Mon, 16 Jan 2012 09:28:15 +0000 Subject: [PATCH] // Combinations are now saved using the global save product action (#PSTEST-354) git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12417 b9a71923-0436-4b27-9f14-aed3839534dd --- .../template/controllers/products/combinations.tpl | 5 ++--- .../default/template/controllers/products/form.tpl | 1 - controllers/admin/AdminProductsController.php | 1 + js/admin-products.js | 4 +--- js/attributesBack.js | 11 ++++++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index 4ea245cd5..191509775 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -43,6 +43,7 @@ var msg_combination_1 = '{l s='Please choose an attribute'}'; var msg_combination_2 = '{l s='Please choose a value'}'; var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}'; + var msg_new_combination = '{l s='New combination'}'; @@ -322,9 +323,6 @@   - - - @@ -332,6 +330,7 @@ +
{$list} diff --git a/admin-dev/themes/default/template/controllers/products/form.tpl b/admin-dev/themes/default/template/controllers/products/form.tpl index 8b7717cd1..ae394bc4d 100644 --- a/admin-dev/themes/default/template/controllers/products/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/form.tpl @@ -204,7 +204,6 @@ if (btn_name == "Combinations") { $('#desc-product-new').hide(); - disableSave(); $('#desc-product-newCombination').show(); populate_attrs(); } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2141270e2..d1ac2d2e4 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1469,6 +1469,7 @@ class AdminProductsControllerCore extends AdminController $this->processSuppliers($token); $this->processWarehouses($token); $this->processFeatures($token); + $this->processProductAttribute($token); $languages = Language::getLanguages(false); if (!$this->updatePackItems($object)) $this->errors[] = Tools::displayError('An error occurred while adding products to the pack.'); diff --git a/js/admin-products.js b/js/admin-products.js index 6e5f9b247..b4150ab03 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -40,7 +40,6 @@ function removeButtonCombination(item) $('#add_new_combination').show(); $('.process-icon-newCombination').removeClass('toolbar-new'); $('.process-icon-newCombination').addClass('toolbar-cancel'); - $('#submitProductAttribute').val($('#submitProductAttribute').attr(item)); $('#desc-product-newCombination div').html($('#ResetBtn').val()); $('id_product_attribute').val(0); init_elems(); @@ -52,8 +51,7 @@ function addButtonCombination(item) $('#add_new_combination').hide(); $('.process-icon-newCombination').removeClass('toolbar-cancel'); $('.process-icon-newCombination').addClass('toolbar-new'); - $('#submitProductAttribute').val($('#submitProductAttribute').attr(item)); - $('#desc-product-newCombination div').html($('#submitProductAttribute').val()); + $('#desc-product-newCombination div').html(msg_new_combination); posC = true; } diff --git a/js/attributesBack.js b/js/attributesBack.js index aa8f47299..90b25b72e 100644 --- a/js/attributesBack.js +++ b/js/attributesBack.js @@ -51,7 +51,6 @@ virtual_product_nb_days, is_shareable) getE('attribute_ean13').value = ean; getE('attribute_upc').value = upc; - getE('submitProductAttribute').value = modifyattributegroup; getE('attribute_wholesale_price').value = Math.abs(wholesale_price); getE('attribute_price').value = Math.abs(price_impact); getE('attribute_weight').value = Math.abs(weight_impact); @@ -120,8 +119,7 @@ virtual_product_nb_days, is_shareable) $("#virtual_product_filename_attribute").val(virtual_product_filename_attribute); $("#add_new_combination").show(); - - + /* Reset all combination images */ combinationImages = $('#id_image_attr').find("input[id^=id_image_attr_]"); combinationImages.each(function() { @@ -131,13 +129,13 @@ virtual_product_nb_days, is_shareable) /* Check combination images */ if (typeof(combination_images[id_product_attribute]) != 'undefined') for (i = 0; i < combination_images[id_product_attribute].length; i++) - getE('id_image_attr_' + combination_images[id_product_attribute][i]).checked = true; - + $('#id_image_attr_' + combination_images[id_product_attribute][i]).attr('checked', 'checked'); check_impact(); check_weight_impact(); check_unit_impact(); var elem = getE('product_att_list'); + for (var i = 0; i < old_attr.length; i++) { var opt = document.createElement('option'); @@ -370,3 +368,6 @@ function openCloseLayer(whichLayer) style.display = style.display == 'none' ? 'block' : 'none'; } +$(document).ready(function(){ + $('#product_form').submit(function(){attr_selectall();console.log('couou');}); +}); \ No newline at end of file