Skip to content

fix(bulk-scan): don't schedule bulk scan, if no license is selected by user #811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2017
Merged

fix(bulk-scan): don't schedule bulk scan, if no license is selected by user #811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/www/ui/scripts/change-license-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,36 @@ function scheduledDeciderError (responseobject, resultEntity) {
resultEntity.show();
}

function isUserError(bulkActions, refText) {
var errorText = "";
if(bulkActions.length < 1) {
errorText += "No licenses to bulk scan selected\n";
}

if(refText.trim().split(" ").length < 2) {
errorText += "Reference text needs to be at least 2 words long"
}

//show errors to user
if(errorText.length > 0) {
alert("Bulk scan not scheduled: \n\n"+errorText);
return true;
}
return false;
}

function scheduleBulkScanCommon(resultEntity, callbackSuccess) {
var bulkActions = getBulkFormTableContent();
var refText = $('#bulkRefText').val();

//checks for user errors
if(isUserError(bulkActions, refText)) {
return;
}

var post_data = {
"bulkAction": getBulkFormTableContent(),
"refText": $('#bulkRefText').val(),
"bulkAction": bulkActions,
"refText": refText,
"bulkScope": $('#bulkScope').val(),
"uploadTreeId": $('#uploadTreeId').val(),
"forceDecision": $('#forceDecision').is(':checked')?1:0
Expand Down Expand Up @@ -198,4 +224,4 @@ function removeMainLicense(uploadId,licenseId) {
})
.fail(failed);
}
}
}