Merge pull request #399 from intersystems/fix-commit-details

Fixed issue where commit details are cut off
intersystems · Jul 8, 2024 · 45e006f · 45e006f
2 parents 24a5e4a + 9cf045d
commit 45e006f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2252,8 +2252,8 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (selectedItemsFromOtherUser.length > 0) {
                         self.confirmActionOnOtherUsersChanges("commit");
                     } else {
-                        var commitMessage = $('#commitMsg').val() + "\n" + $("#commitMsgDetail").val();
-                        self.commit(commitMessage);
+                        var commitMessage = $('#commitMsg').val();
+                        self.commit(commitMessage, $("#commitMsgDetail").val());
                     }
 
                 });
@@ -2455,11 +2455,11 @@ webui.NewChangedFilesView = function(workspaceView) {
         });
     }
 
-    self.commit = function(message) {
+    self.commit = function(message, details) {
         var selectedFilesAsString = selectedItems.join(" ");
 
         webui.git("add " + selectedFilesAsString);
-        webui.git('commit -m "' + message + '" -- ' + selectedFilesAsString, function(output) {
+        webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
             webui.showSuccess(output);
             workspaceView.update();
         });

diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -2252,8 +2252,8 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (selectedItemsFromOtherUser.length > 0) {
                         self.confirmActionOnOtherUsersChanges("commit");
                     } else {
-                        var commitMessage = $('#commitMsg').val() + "\n" + $("#commitMsgDetail").val();
-                        self.commit(commitMessage);
+                        var commitMessage = $('#commitMsg').val();
+                        self.commit(commitMessage, $("#commitMsgDetail").val());
                     }
 
                 });
@@ -2455,11 +2455,11 @@ webui.NewChangedFilesView = function(workspaceView) {
         });
     }
 
-    self.commit = function(message) {
+    self.commit = function(message, details) {
         var selectedFilesAsString = selectedItems.join(" ");
 
         webui.git("add " + selectedFilesAsString);
-        webui.git('commit -m "' + message + '" -- ' + selectedFilesAsString, function(output) {
+        webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
             webui.showSuccess(output);
             workspaceView.update();
         });