jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Device Batch Managed Groups

Browse Source
This commit is contained in:
Gary Sharp
2016-11-09 16:27:07 +11:00
parent afa548fb70
commit f74d49b96e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Devices/ManagedGroups/DeviceBatchAssignedUsersManagedGroup.cs
+1 -1
View File
@@ -57,7 +57,7 @@ namespace Disco.Services.Devices.ManagedGroups
repositorySubscription = RepositoryEvents.Value repositorySubscription = RepositoryEvents.Value
.Where(e => .Where(e =>
(((Device)e.Entity).DeviceBatchId == DeviceBatchId) || (((Device)e.Entity).DeviceBatchId == DeviceBatchId) ||
(e.EventType == RepositoryMonitorEventType.Modified && e.GetPreviousPropertyValue<int>("DeviceBatchId") == DeviceBatchId)) (e.EventType == RepositoryMonitorEventType.Modified && e.GetPreviousPropertyValue<int?>("DeviceBatchId") == DeviceBatchId))
.Subscribe(ProcessRepositoryEvent); .Subscribe(ProcessRepositoryEvent);
} }
Disco.Services/Devices/ManagedGroups/DeviceBatchDevicesManagedGroup.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace Disco.Services.Devices.ManagedGroups
repositorySubscription = RepositoryEvents.Value repositorySubscription = RepositoryEvents.Value
.Where(e => .Where(e =>
(((Device)e.Entity).DeviceBatchId == DeviceBatchId) || (((Device)e.Entity).DeviceBatchId == DeviceBatchId) ||
(e.EventType == RepositoryMonitorEventType.Modified && e.GetPreviousPropertyValue<int>("DeviceBatchId") == DeviceBatchId)) (e.EventType == RepositoryMonitorEventType.Modified && e.GetPreviousPropertyValue<int?>("DeviceBatchId") == DeviceBatchId))
.Subscribe(ProcessRepositoryEvent); .Subscribe(ProcessRepositoryEvent);
} }
Disco.Web/Areas/API/Controllers/DeviceBatchController.cs
+1 -1
View File
@@ -500,7 +500,7 @@ namespace Disco.Web.Areas.API.Controllers
DeviceBatch.AssignedUsersLinkedGroup = configJson; DeviceBatch.AssignedUsersLinkedGroup = configJson;
Database.SaveChanges(); Database.SaveChanges();
var managedGroup = DeviceBatchDevicesManagedGroup.Initialize(DeviceBatch); var managedGroup = DeviceBatchAssignedUsersManagedGroup.Initialize(DeviceBatch);
if (managedGroup != null) // Sync Group if (managedGroup != null) // Sync Group
return ADManagedGroupsSyncTask.ScheduleSync(managedGroup); return ADManagedGroupsSyncTask.ScheduleSync(managedGroup);
} }