Merge pull request #684 from intersystems/issue-660

Fix Studio warningCallback issue

Author: isc-tleavitt

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2.9.1] - Unreleased
 
 ### Fixed
+- Fixed not showing warnings on Studio (#660)
 - Fixed business processes and rules not being added to source control automatically (#676)
 - Embedded Git commits settings when cloning empty repo to avert any issues
 

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -146,7 +146,7 @@ webui.parseGitResponse = function(data) {
     };
 }
 
-webui.processGitResponse = function(data, command, callback) {
+webui.processGitResponse = function(data, command, callback, warningCallback) {
     var result = webui.parseGitResponse(data);
     var rcode = result.rcode;
     var output = result.output;
@@ -158,7 +158,7 @@ webui.processGitResponse = function(data, command, callback) {
         }
         // Return code is 0 but there is stderr output: this is a warning message
         if (message.length > 0) {
-            if(warningCallback) {
+            if (warningCallback) {
                 warningCallback(message);
             } else {
                 webui.showWarning(message);
@@ -185,7 +185,7 @@ webui.processGitResponse = function(data, command, callback) {
     }
 }
 
-webui.git_command = function(command, callback) {
+webui.git_command = function(command, callback, warningCallback) {
     $.ajax({
         url: "git-command",
         type: "POST",
@@ -194,7 +194,7 @@ webui.git_command = function(command, callback) {
             command: command
         }),
         success: function(data) {
-            webui.processGitResponse(data, command, callback);
+            webui.processGitResponse(data, command, callback, warningCallback);
         },
         error: function(data) {
             var trimmedData = data.replace(/(\r\n)/gm, "\n");

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -146,7 +146,7 @@ webui.parseGitResponse = function(data) {
     };
 }
 
-webui.processGitResponse = function(data, command, callback) {
+webui.processGitResponse = function(data, command, callback, warningCallback) {
     var result = webui.parseGitResponse(data);
     var rcode = result.rcode;
     var output = result.output;
@@ -158,7 +158,7 @@ webui.processGitResponse = function(data, command, callback) {
         }
         // Return code is 0 but there is stderr output: this is a warning message
         if (message.length > 0) {
-            if(warningCallback) {
+            if (warningCallback) {
                 warningCallback(message);
             } else {
                 webui.showWarning(message);
@@ -185,7 +185,7 @@ webui.processGitResponse = function(data, command, callback) {
     }
 }
 
-webui.git_command = function(command, callback) {
+webui.git_command = function(command, callback, warningCallback) {
     $.ajax({
         url: "git-command",
         type: "POST",
@@ -194,7 +194,7 @@ webui.git_command = function(command, callback) {
             command: command
         }),
         success: function(data) {
-            webui.processGitResponse(data, command, callback);
+            webui.processGitResponse(data, command, callback, warningCallback);
         },
         error: function(data) {
             var trimmedData = data.replace(/(\r\n)/gm, "\n");