From e778ea0918ba8ebbeefcf042a7f99d8a4a2f3c8e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 23 Jun 2020 22:19:04 -0400 Subject: [PATCH] Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. --- web/skins/classic/views/js/user.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/web/skins/classic/views/js/user.js b/web/skins/classic/views/js/user.js index 65c05c546..f32f05e27 100644 --- a/web/skins/classic/views/js/user.js +++ b/web/skins/classic/views/js/user.js @@ -12,16 +12,22 @@ function validateForm( form, newUser ) { } else if ( newUser ) { errors[errors.length] = "You must supply a password"; } - var monitorIds = new Array(); - for ( var i = 0; i < form.elements['monitorIds'].options.length; i++ ) { - if ( form.elements['monitorIds'].options[i].selected ) { - monitorIds[monitorIds.length] = form.elements['monitorIds'].options[i].value; - } - } - form.elements['newUser[MonitorIds]'].value = monitorIds.join( ',' ); if ( errors.length ) { - alert( errors.join( "\n" ) ); - return ( false ); + alert(errors.join("\n")); + return false; } - return ( true ); + return true; } + +function initPage() { + $j('#contentForm').submit(function(event) { + if ( validateForm(this) ) { + $j('#contentButtons').hide(); + return true; + } else { + return false; + }; + }); +} // end function initPage + +window.addEventListener('DOMContentLoaded', initPage);