github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 15:56:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* userManagementController.js: fixed #881

Browse source 
* UserManagementModule.cs:
This commit is contained in:
TidusJar 2017-01-02 20:23:53 +00:00
parent 34e00e15c2
commit f074f28db7
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ombi.UI/Content/app/userManagement/userManagementController.js
View file

@ -74,6 +74,8 @@
}
}
if(Array.isArray($scope.users)){
var existingUsername = $scope.users.some(function (u) {
return u.username === $scope.user.username;
});
@ -81,6 +83,7 @@
if (existingUsername) {
return generateNotify("A user with the username " + $scope.user.username + " already exists!", 'danger');
}
}
userManagementService.addUser($scope.user, $scope.selectedPermissions, $scope.selectedFeatures)
.then(function (data) {
@ -92,6 +95,8 @@
clearCheckboxes();
};
});
};
// Watch the checkboxes for updates (Creating a user)

21
Ombi.UI/Modules/UserManagementModule.cs
View file

@ -86,21 +86,18 @@ namespace Ombi.UI.Modules
{
//Get Plex Users
var plexUsers = PlexApi.GetUsers(plexSettings.PlexAuthToken);
foreach (var u in plexUsers.User)
{
var dbUser = plexDbUsers.FirstOrDefault(x => x.PlexUserId == u.Id);
var userDb = userLogins.FirstOrDefault(x => x.UserId == u.Id);
if (plexUsers != null && plexUsers.User != null) {
foreach (var u in plexUsers.User) {
var dbUser = plexDbUsers.FirstOrDefault (x => x.PlexUserId == u.Id);
var userDb = userLogins.FirstOrDefault (x => x.UserId == u.Id);
// We don't have the user in the database yet
if (dbUser == null)
{
model.Add(MapPlexUser(u, null, userDb?.LastLoggedIn ?? DateTime.MinValue));
}
else
{
if (dbUser == null) {
model.Add (MapPlexUser (u, null, userDb?.LastLoggedIn ?? DateTime.MinValue));
} else {
// The Plex User is in the database
model.Add(MapPlexUser(u, dbUser, userDb?.LastLoggedIn ?? DateTime.MinValue));
model.Add (MapPlexUser (u, dbUser, userDb?.LastLoggedIn ?? DateTime.MinValue));
}
}
}