diff --git a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
index 3c3008c9..a4a5680d 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
+++ b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
@@ -90,7 +90,7 @@
@if (!string.IsNullOrWhiteSpace(Model.Invites[i].ResetUrl))
{
- Reset Password
+ Password Reset
}
diff --git a/Server/Data/DataService.cs b/Server/Data/DataService.cs
index 66c62bad..985c6f5c 100644
--- a/Server/Data/DataService.cs
+++ b/Server/Data/DataService.cs
@@ -176,6 +176,13 @@ namespace Remotely.Server.Data
x.ID == deviceID);
}
+ public List GetDeviceGroupsForUserName(string username)
+ {
+ var user = RemotelyContext.Users.FirstOrDefault(x => x.UserName == username);
+
+ return RemotelyContext.DeviceGroups.Where(x => x.OrganizationID == user.OrganizationID).ToList();
+ }
+
public RemotelyUser GetUserByID(string userID)
{
if (userID == null)
@@ -349,7 +356,7 @@ namespace Remotely.Server.Data
.FirstOrDefault(x => x.UserName == requesterUserName);
var invite = requester.Organization.InviteLinks.FirstOrDefault(x => x.ID == inviteID);
var user = RemotelyContext.Users.FirstOrDefault(x => x.UserName == invite.InvitedUser);
- if (string.IsNullOrWhiteSpace(user.PasswordHash))
+ if (user != null && string.IsNullOrWhiteSpace(user.PasswordHash))
{
RemotelyContext.Remove(user);
}
diff --git a/Server/Pages/Index.cshtml.cs b/Server/Pages/Index.cshtml.cs
index d4d7c98f..05aa27ad 100644
--- a/Server/Pages/Index.cshtml.cs
+++ b/Server/Pages/Index.cshtml.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Remotely.Shared.Models;
+using Microsoft.AspNetCore.Mvc.Rendering;
namespace Remotely.Server.Pages
{
@@ -19,13 +20,19 @@ namespace Remotely.Server.Pages
}
public string DefaultPrompt { get; set; }
+ public List DeviceGroups { get; set; } = new List();
public void OnGet()
{
if (User?.Identity?.IsAuthenticated == true)
{
DefaultPrompt = DataService.GetDefaultPrompt(User.Identity.Name);
-
+ var groups = DataService.GetDeviceGroupsForUserName(User.Identity.Name);
+ DeviceGroups.Add(new SelectListItem("All", null));
+ if (groups?.Any() == true)
+ {
+ DeviceGroups.AddRange(groups.Select(x => new SelectListItem(x.Name, x.ID)));
+ }
}
else
{
diff --git a/Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml
index 8322c17b..e4ea40c0 100644
--- a/Server/Pages/RemoteControl.cshtml
+++ b/Server/Pages/RemoteControl.cshtml
@@ -138,5 +138,10 @@
+