R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed bug, that broke UUID changer when user provides spaces in UUID. #102

Merged
bema merged 2 commits from widlam/bug/issue#101 into master 2023-03-06 15:05:53 +01:00
Conversation 1 Commits 2 Files Changed 2 +5 -2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Backend/mocked-services/src/main/resources/static/js/datatransfer.js
View File

@@ -280,9 +280,10 @@ async function fetchUUIDCheck(givenUUID , strategy){
} }
function checkUUIDChars(uuid) { function checkUUIDChars(uuid) {
uuid.replace(/ /g,'')
console.log("UUID in check: " + uuid); console.log("UUID in check: " + uuid);
const regex = new RegExp("^[A-z0-9-]+$"); const regex = new RegExp("^[A-z0-9-]+$");
if(regex.test(uuid)){ if(regex.test(uuid) || uuid == ""){
return uuid ; return uuid ;
} }
return "invalid"; return "invalid";
@@ -309,7 +310,6 @@ function changeUUID(element){
changeMessage = "success"; changeMessage = "success";
} }
clientUUID = data; clientUUID = data;
$("#uuid-input").attr("disabled", true);
$("#editable").attr("checked", false); $("#editable").attr("checked", false);
uuidChangeModalDisplay(changeMessage); uuidChangeModalDisplay(changeMessage);

3
Backend/mocked-services/src/main/resources/static/js/modal.js
View File

@@ -74,13 +74,16 @@ function showModal(jmodal){
function hideModal(jmodal){ function hideModal(jmodal){
if(!modalDisplayed) return; if(!modalDisplayed) return;
if ($(uuidChangeModal).hasClass('active')) window.location.reload();
overlay.removeClass('active'); overlay.removeClass('active');
jmodal.removeClass('active'); jmodal.removeClass('active');
modalDisplayed = false; modalDisplayed = false;
} }
btnModalClose.click(closeModals); btnModalClose.click(closeModals);
overlay.click(closeModals); overlay.click(closeModals);
dataLossModalNo.click(closeModals); dataLossModalNo.click(closeModals);
dataLossModalYes.click(dropChangesAndClose); dataLossModalYes.click(dropChangesAndClose);