fix: other user's changes display username in workspace view

isc-pbarton · isc-pbarton · commit 490100199c8d · 2024-10-08T16:25:09.000-04:00
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
@@ -2560,7 +2560,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (isForCurrentUser) {
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);
                     } else {
-                        var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];
+                        var otherUser = otherUserUncommittedItems[model] || otherUserUncommittedItems[model.replace(/\//g, '\\')];
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);
                     }
                     
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
@@ -2560,7 +2560,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (isForCurrentUser) {
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);
                     } else {
-                        var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];
+                        var otherUser = otherUserUncommittedItems[model] || otherUserUncommittedItems[model.replace(/\//g, '\\')];
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);
                     }
                     

Original file line number	Diff line number	Diff line change
`@@ -2560,7 +2560,7 @@ webui.NewChangedFilesView = function(workspaceView) {`
`2560`	`2560`	`if (isForCurrentUser) {`
`2561`	`2561`	`addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);`
`2562`	`2562`	`} else {`
`2563`		`- var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];`
	`2563`	`+ var otherUser = otherUserUncommittedItems[model] \|\| otherUserUncommittedItems[model.replace(/\//g, '\\')];`
`2564`	`2564`	`addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);`
`2565`	`2565`	`}`
`2566`	`2566`