mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexists 

Added warning notification when user home already exists
This commit is contained in:
Thomas Müller 2013-10-22 13:45:45 -07:00
parent cadd71ec8a 00f4928866
commit 6eec8b2550
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings/ajax/createuser.php
View File

@ -38,8 +38,15 @@ try {
} }
OC_Group::addToGroup( $username, $i ); OC_Group::addToGroup( $username, $i );
} }
// check whether the user's files home exists
$userDirectory = OC_User::getHome($username) . '/files/';
$homeExists = file_exists($userDirectory);
OC_JSON::success(array("data" => OC_JSON::success(array("data" =>
array( array(
// returns whether the home already existed
"homeExists" => $homeExists,
"username" => $username, "username" => $username,
"groups" => OC_Group::getUserGroups( $username )))); "groups" => OC_Group::getUserGroups( $username ))));
} catch (Exception $exception) { } catch (Exception $exception) {

12
settings/js/users.js
View File

@ -467,6 +467,18 @@ $(document).ready(function () {
var addedGroups = result.data.groups; var addedGroups = result.data.groups;
UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups)); UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
} }
if (result.data.homeExists){
OC.Notification.hide();
OC.Notification.show(t('settings', 'Warning: Home directory for user "{user}" already exists', {user: result.data.username}));
if (UserList.notificationTimeout){
window.clearTimeout(UserList.notificationTimeout);
}
UserList.notificationTimeout = window.setTimeout(
function(){
OC.Notification.hide();
UserList.notificationTimeout = null;
}, 10000);
}
if($('tr[data-uid="' + username + '"]').length === 0) { if($('tr[data-uid="' + username + '"]').length === 0) {
UserList.add(username, username, result.data.groups, null, 'default', true); UserList.add(username, username, result.data.groups, null, 'default', true);
} }