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

Resolved merge conflict

Browse Source
This commit is contained in:
Adam Bem
2023-03-07 11:52:57 +01:00
parent 599bcf96b2 0844525f8e
commit 6874e463fa
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,8 @@ function checkUUIDChars(uuid) {
uuid.replace(/ /g,'') 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) || uuid == ""){
if(regex.test(uuid) && uuid != ""){
return uuid ; return uuid ;
} }
return "invalid"; return "invalid";
@@ -292,9 +293,7 @@ function checkUUIDChars(uuid) {
function changeUUID(element){ function changeUUID(element){
const uuidStrategy = $('input[name="uuid-validation-type"]:checked').val(); const uuidStrategy = $('input[name="uuid-validation-type"]:checked').val();
// const givenUUID = checkUUIDChars(element.value); const givenUUID = checkUUIDChars(element.value);
const givenUUID = element.value;
console.log(givenUUID);
if( givenUUID == clientUUID ){ if( givenUUID == clientUUID ){
$("#uuid-input").attr("disabled", true); $("#uuid-input").attr("disabled", true);