Skip to content

Commit b8b143c

Browse files
committed
Compile discarded classes and fix file contents
Replaced HTML characters with escaped versions, made sure discarded files are compiled after import
1 parent 5fe6a7c commit b8b143c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

cls/SourceControl/Git/DiscardState.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Method RestoreToFileTree()
3333

3434
// Add file to source-control / IRIS
3535
if '..ExternalFile {
36-
do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)
36+
do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1, 1)
3737
do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
3838
}
3939

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2019,6 +2019,7 @@ webui.DiscardedView = function(mainView) {
20192019
var discardElement = $('.restore-discarded')[0];
20202020
discardElement.innerHTML = '';
20212021
discardElement.appendChild(btn);
2022+
var contents = discardedState.Contents.replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
20222023

20232024
$('.restore-discarded-btn').off("click").on("click", function() {
20242025
$.post("restore-discarded", {file: discardedState.Id}, function(message) {
@@ -2032,7 +2033,7 @@ webui.DiscardedView = function(mainView) {
20322033
});
20332034
});
20342035

2035-
$('.file-contents').html('<pre>' + discardedState.Contents + '</pre>');
2036+
$('.file-contents').html('<pre>' + contents + '</pre>');
20362037
});
20372038

20382039

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2019,6 +2019,7 @@ webui.DiscardedView = function(mainView) {
20192019
var discardElement = $('.restore-discarded')[0];
20202020
discardElement.innerHTML = '';
20212021
discardElement.appendChild(btn);
2022+
var contents = discardedState.Contents.replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
20222023

20232024
$('.restore-discarded-btn').off("click").on("click", function() {
20242025
$.post("restore-discarded", {file: discardedState.Id}, function(message) {
@@ -2032,7 +2033,7 @@ webui.DiscardedView = function(mainView) {
20322033
});
20332034
});
20342035

2035-
$('.file-contents').html('<pre>' + discardedState.Contents + '</pre>');
2036+
$('.file-contents').html('<pre>' + contents + '</pre>');
20362037
});
20372038

20382039

0 commit comments

Comments
 (0)