Fixed detect changes in custom options section (product edit) (#2444)

fballiano · web-flow · commit 4a952b0d3ca9 · 2022-09-26T15:51:53.000+01:00
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
@@ -196,6 +196,11 @@ Bundle.Selection.prototype = {
                 }
             );
         }
+
+        var inputs = $$('#bundle_option_' + data.parentIndex + ' input');
+        inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el));  } )
+        var inputs = $$('#bundle_option_' + data.parentIndex + ' button.delete');
+        inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el));  } )
     },
 
     bindScopeCheckbox : function(){
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml
@@ -117,6 +117,8 @@ var productOption = {
         }
         <?php else: ?>
             inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el));  } )
+            var inputs = $$('div.product-custom-options button');
+            inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el));  } )
         <?php endif ?>
     }
 }
@@ -316,8 +318,6 @@ if($('option_panel')){
     $('option_panel').remove();
 }
 
-productOption.bindRemoveButtons();
-
 if($('<?php echo $this->getAddButtonId() ?>')){
     Event.observe('<?php echo $this->getAddButtonId() ?>', 'click', productOption.add.bind(productOption));
 }
@@ -337,6 +337,8 @@ Validation.addAllThese([
     productOptionType.addDataToValues(<?php echo $_value->toJson() ?>);
 <?php endforeach ?>
 
+productOption.bindRemoveButtons();
+
 //bind scope checkboxes
 productOptionScope.bindScopeCheckbox();
 //]]>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
@@ -67,7 +67,6 @@ selectOptionType = {
     templateSyntax : /(^|.|\r|\n)({{(\w+)}})/,
     templateText : OptionTemplateSelectRow,
     add : function(data) {
-
         this.template = new Template(this.templateText, this.templateSyntax);
 
         if (data.target || data.srcElement) {//data is Event (work in IE and Firefox)
@@ -86,6 +85,11 @@ selectOptionType = {
 
         Element.insert($(this.div+'_'+data.id), {'bottom':this.template.evaluate(data)});
 
+        var inputs = $$('#product_option_'+data.id+'_select_'+data.select_id+' input', '#product_option_'+data.id+'_select_'+data.select_id+' select', '#product_option_'+data.id+'_select_'+data.select_id+' textarea');
+        inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el)); });
+        var inputs = $$('#product_option_'+data.id+'_select_'+data.select_id+' button');
+        inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el));  });
+
         if (data.checkboxScopeTitle) {
             //set disabled
             if ($('product_option_'+data.id+'_select_'+data.select_id+'_title') && data.scopeTitleDisabled) {
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
@@ -131,6 +131,9 @@ var groupPriceControl = {
         $('<?php echo $_htmlId; ?>_container').select('input', 'select').each(function(element) {
             Event.observe(element, 'change', element.setHasChanges.bind(element));
         });
+        $('<?php echo $_htmlId; ?>_container').select('button.delete').each(function(element) {
+            Event.observe(element, 'click', element.setHasChanges.bind(element));
+        });
         <?php endif ?>
     },
     disableElement: function(element) {
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
@@ -136,6 +136,7 @@ var tierPriceControl = {
         $('<?php echo $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
         <?php else: ?>
         $('<?php echo $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
+        $('<?php echo $_htmlId ?>_container').select('button.delete').each(function(el){ Event.observe(el, 'click', el.setHasChanges.bind(el)); });
         <?php endif ?>
     },
     disableElement: function(el) {
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
@@ -100,7 +100,7 @@
 
 <script type="text/javascript">
 //<![CDATA[
-var linkTemplate = '<tr>'+
+var linkTemplate = '<tr id="downloadable_link_{{id}}">'+
     '<td>'+
         '<input type="hidden" class="__delete__" name="downloadable[link][{{id}}][is_delete]" value="" />'+
         '<input type="hidden" name="downloadable[link][{{id}}][link_id]" value="{{link_id}}" />'+
@@ -310,6 +310,11 @@ var linkItems = {
         this.itemCount++;
         this.togglePriceFields();
         this.bindRemoveButtons();
+
+        var inputs = $$('#downloadable_link_' + data.id + ' input');
+        inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el));  } )
+        var inputs = $$('#downloadable_link_' + data.id + ' button.delete');
+        inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el));  } )
     },
     remove : function(event){
         var element = $(Event.findElement(event, 'tr'));
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml
@@ -75,7 +75,7 @@
 </div>
 <script type="text/javascript">
 //<![CDATA[>
-var sampleTemplate = '<tr>'+
+var sampleTemplate = '<tr id="downloadable_sample_{{id}}">'+
                         '<td>'+
                             '<input type="hidden" class="__delete__" name="downloadable[sample][{{id}}][is_delete]" value="" />'+
                             '<input type="hidden" name="downloadable[sample][{{id}}][sample_id]" value="{{sample_id}}" />'+
@@ -176,13 +176,20 @@ var sampleItems = {
 
         this.itemCount++;
         this.bindRemoveButtons();
+
+        var inputs = $$('#downloadable_sample_' + data.id + ' input');
+        inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el));  } )
+        var inputs = $$('#downloadable_sample_' + data.id + ' button.delete');
+        inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el));  } )
     },
     remove : function(event){
         var element = $(Event.findElement(event, 'tr'));
         alertAlreadyDisplayed = false;
         if(element){
             element.down('input[type="hidden"].__delete__').value = '1';
-            element.down('div.flex').remove();
+            Element.select(element, 'div.flex').each(function(elm){
+                elm.remove();
+            });
             element.addClassName('no-display');
             element.addClassName('ignore-validate');
             element.hide();
diff --git a/js/mage/adminhtml/product.js b/js/mage/adminhtml/product.js
@@ -744,8 +744,17 @@ Product.Configurable.prototype = {
         this.updateSaveInput();
     },
     updateSaveInput : function() {
-        $(this.idPrefix + 'save_attributes').value = Object.toJSON(this.attributes);
-        $(this.idPrefix + 'save_links').value = Object.toJSON(this.links);
+        var oldSaveAttributesValue = $(this.idPrefix + 'save_attributes').value;
+        var oldSaveLinksValue = $(this.idPrefix + 'save_links').value;
+        var newSaveAttributesValue = Object.toJSON(this.attributes);
+        var newSaveLinksValue = Object.toJSON(this.links);
+        $(this.idPrefix + 'save_attributes').value = newSaveAttributesValue;
+        $(this.idPrefix + 'save_links').value = newSaveLinksValue;
+        if (oldSaveAttributesValue != newSaveAttributesValue || oldSaveLinksValue != newSaveLinksValue) {
+            try {
+                document.getElementById('configurable_save_attributes').setHasChanges();
+            } catch (e) {}
+        }
     },
     initializeAdvicesForSimpleForm : function() {
         if ($(this.idPrefix + 'simple_form').advicesInited) {

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,11 @@ Bundle.Selection.prototype = {`
`196`	`196`	`}`
`197`	`197`	`);`
`198`	`198`	`}`
	`199`	`+`
	`200`	`+ var inputs = $$('#bundle_option_' + data.parentIndex + ' input');`
	`201`	`+ inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el)); } )`
	`202`	`+ var inputs = $$('#bundle_option_' + data.parentIndex + ' button.delete');`
	`203`	`+ inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el)); } )`
`199`	`204`	`},`
`200`	`205`
`201`	`206`	`bindScopeCheckbox : function(){`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ var productOption = {`
`117`	`117`	`}`
`118`	`118`	`<?php else: ?>`
`119`	`119`	`inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el)); } )`
	`120`	`+ var inputs = $$('div.product-custom-options button');`
	`121`	`+ inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el)); } )`
`120`	`122`	`<?php endif ?>`
`121`	`123`	`}`
`122`	`124`	`}`
`@@ -316,8 +318,6 @@ if($('option_panel')){`
`316`	`318`	`$('option_panel').remove();`
`317`	`319`	`}`
`318`	`320`
`319`		`-productOption.bindRemoveButtons();`
`320`		`-`
`321`	`321`	`if($('<?php echo $this->getAddButtonId() ?>')){`
`322`	`322`	`Event.observe('<?php echo $this->getAddButtonId() ?>', 'click', productOption.add.bind(productOption));`
`323`	`323`	`}`
`@@ -337,6 +337,8 @@ Validation.addAllThese([`
`337`	`337`	`productOptionType.addDataToValues(<?php echo $_value->toJson() ?>);`
`338`	`338`	`<?php endforeach ?>`
`339`	`339`
	`340`	`+productOption.bindRemoveButtons();`
	`341`	`+`
`340`	`342`	`//bind scope checkboxes`
`341`	`343`	`productOptionScope.bindScopeCheckbox();`
`342`	`344`	`//]]>`