Merge branch '1.7.2.x' into develop

timactive · Aug 31, 2017 · a4f1b1a · a4f1b1a
2 parents fe881a9 + e344776
commit a4f1b1a
Show file tree

Hide file tree

Showing 37 changed files with 27,032 additions and 681 deletions.
diff --git a/admin-dev/themes/default/js/bundle/product/form.js b/admin-dev/themes/default/js/bundle/product/form.js
@@ -836,7 +836,7 @@ var warehouseCombinations = (function() {
 var form = (function() {
   var elem = $('#form');
 
-  function send(redirect, target) {
+  function send(redirect, target, callBack) {
     // target value by default
     if (typeof(target) == 'undefined') {
       target = false;
@@ -866,6 +866,9 @@ var form = (function() {
         $('#form-nav li.has-error').removeClass('has-error');
       },
       success: function(response) {
+        if (callBack) {
+          callBack();
+        }
         showSuccessMessage(translate_javascripts['Form update success']);
         //update the customization ids
         if (typeof response.customization_fields_ids != "undefined") {
@@ -1138,8 +1141,8 @@ var form = (function() {
         imagesProduct.initExpander();
       });
     },
-    'send': function() {
-      send();
+    'send': function(redirect, target, callBack) {
+      send(redirect, target, callBack);
     },
     'switchLanguage': function(iso_code) {
       switchLanguage(iso_code);