Merge pull request #446 from intersystems/amend-commit-details

isc-hwojnick · web-flow · commit 45a86e776210 · 2024-08-01T15:55:21.000-04:00
amend message details work properly when files are selected
diff --git a/git-webui/release/share/git-webui/webui/img/context.svg b/git-webui/release/share/git-webui/webui/img/context.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#eee"><path d="M600-40q-33 0-56.5-23.5T520-120q0-23 11-41t29-29v-221q-18-11-29-28.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 23-11 40.5T640-411v115l160-53v-62q-18-11-29-28.5T760-480q0-33 23.5-56.5T840-560q33 0 56.5 23.5T920-480q0 23-11 40.5T880-411v119l-240 80v22q18 11 29 29t11 41q0 33-23.5 56.5T600-40ZM160-160v-560 560Zm0 0q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640H447l-80-80H160v480h280v80H160Z"/></svg>
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
@@ -2633,17 +2633,16 @@ webui.NewChangedFilesView = function(workspaceView) {
     }
 
     self.amend = function(message, details) {
-        var selectedFilesAsString = selectedItems.join(" ");
 
         if (self.commitMsgEmpty()) {
-            webui.git("add " + selectedFilesAsString);
+            webui.git_command(["add"].concat(selectedItems));
             webui.git_command(['commit', '--amend', '--no-edit', '--'].concat(selectedItems), function(output) {
                 webui.showSuccess(output);
                 workspaceView.update();
             });
         } else if (selectedItems.length != 0) {
-            webui.git("add " + selectedFilesAsString);
-            webui.git_command(['commit', '--amend', '-m', message, '-m', 'details', '--'].concat(selectedItems), function(output) {
+            webui.git_command(["add"].concat(selectedItems));
+            webui.git_command(['commit', '--amend', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
                 webui.showSuccess(output);
                 workspaceView.update();
             });
@@ -2658,7 +2657,6 @@ webui.NewChangedFilesView = function(workspaceView) {
     }
 
     self.commit = function(message, details) {
-        // var selectedFilesAsString = selectedItems.join(" ");
         webui.git_command(["add"].concat(selectedItems));
         webui.git_command(['commit', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
             webui.showSuccess(output);
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
@@ -2642,7 +2642,7 @@ webui.NewChangedFilesView = function(workspaceView) {
             });
         } else if (selectedItems.length != 0) {
             webui.git_command(["add"].concat(selectedItems));
-            webui.git_command(['commit', '--amend', '-m', message, '-m', 'details', '--'].concat(selectedItems), function(output) {
+            webui.git_command(['commit', '--amend', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
                 webui.showSuccess(output);
                 workspaceView.update();
             });
