Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-14 02:48:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from birarda/feat/content-settings

Browse source 
fix regex for archive name, add general creation error message
This commit is contained in:
Ryan Huffman 2018-02-22 15:14:24 -08:00 committed by GitHub
commit c6a806072d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions

10
domain-server/resources/web/content/js/content.js
View file

@ -391,7 +391,7 @@ $(document).ready(function(){
return false;
}
var MANUAL_ARCHIVE_NAME_REGEX = /^[a-zA-Z0-9\\-_ ]+$/;
var MANUAL_ARCHIVE_NAME_REGEX = /^[a-zA-Z0-9\-_ ]+$/;
if (!MANUAL_ARCHIVE_NAME_REGEX.test(inputValue)) {
swal.showInputError("Valid characters include A-z, 0-9, ' ', '_', and '-'.");
return false;
@ -407,12 +407,14 @@ $(document).ready(function(){
}).done(function(data) {
// since we successfully setup a new content archive, reload the table of archives
// which should show that this archive is pending creation
swal.close();
reloadBackupInformation();
}).fail(function(jqXHR, textStatus, errorThrown) {
showErrorMessage(
"Error",
"There was an unexpected error creating the manual content archive"
)
});
swal.close();
});
});