github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git

Browse source
This commit is contained in:
Jamie.Rees 2017-01-04 08:24:59 +00:00
commit 98a91faf52
3 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ombi.Api.Models/Watcher/WatcherResponse.cs Normal file
View file

@ -0,0 +1,8 @@
using System;
namespace Ombi.Api.Models
{
public class WatcherResponse<T>
{
}
}

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

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

@ -86,23 +86,20 @@ namespace Ombi.UI.Modules
{ {
//Get Plex Users //Get Plex Users
var plexUsers = PlexApi.GetUsers(plexSettings.PlexAuthToken); var plexUsers = PlexApi.GetUsers(plexSettings.PlexAuthToken);
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);
foreach (var u in plexUsers.User) // We don't have the user in the database yet
{ if (dbUser == null) {
var dbUser = plexDbUsers.FirstOrDefault(x => x.PlexUserId == u.Id); model.Add (MapPlexUser (u, null, userDb?.LastLoggedIn ?? DateTime.MinValue));
var userDb = userLogins.FirstOrDefault(x => x.UserId == u.Id); } else {
// The Plex User is in the database
// We don't have the user in the database yet model.Add (MapPlexUser (u, dbUser, userDb?.LastLoggedIn ?? DateTime.MinValue));
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));
}
}
// Also get the server admin // Also get the server admin
var account = PlexApi.GetAccount(plexSettings.PlexAuthToken); var account = PlexApi.GetAccount(plexSettings.PlexAuthToken);