diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
| commit | 46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3 (patch) | |
| tree | 78896053233f385afbdc6006eade163626048bf6 /settings/js/users.js | |
| parent | 7d2a68fc314bcefa69413d85e69ffd10dc34ddc5 (diff) | |
| parent | 3a184e2e1d7ae49d596e06b724ffc36382d02596 (diff) | |
| download | nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.tar.gz nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.zip | |
fix merge conflicts
Diffstat (limited to 'settings/js/users.js')
| -rw-r--r-- | settings/js/users.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/js/users.js b/settings/js/users.js index eed93d3b303..e6eee4ce4fa 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -158,10 +158,11 @@ $(document).ready(function(){ event.preventDefault(); var username=$('#newusername').val(); if($('#content table tbody tr').filterAttr('data-uid',username).length>0){ + OC.dialogs.alert('The username is already being used', 'Error creating user'); return; } if($.trim(username) == '') { - alert('Please provide a username!'); + OC.dialogs.alert('A valid username must be provided', 'Error creating user'); return false; } var password=$('#newuserpassword').val(); @@ -177,6 +178,7 @@ $(document).ready(function(){ function(result){ if(result.status!='success'){ tr.remove(); + OC.dialogs.alert(result.data.message, 'Error creating user'); } } ); |