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

Ombi.Api.Models/Watcher/WatcherResponse.cs

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

Ombi.UI/Content/app/userManagement/userManagementController.js

@@ -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)

Ombi.UI/Modules/UserManagementModule.cs

@@ -86,23 +86,20 @@ 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);
-
-                    // We don't have the user in the database yet
-                    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));
-                    }
-                }
+				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 {
+							// The Plex User is in the database
+							model.Add (MapPlexUser (u, dbUser, userDb?.LastLoggedIn ?? DateTime.MinValue));
+						}
+					}
+				}
 
                 // Also get the server admin
                 var account = PlexApi.GetAccount(plexSettings.PlexAuthToken);