CU-868d85dv8 Minor bug fixes

Author: ucswift

Web/Resgrid.Web/Areas/User/Controllers/DispatchController.cs

@@ -510,6 +510,10 @@ public async Task<IActionResult> UpdateCall(int callId)
 
 			UpdateCallView model = new UpdateCallView();
 			model.Call = await _callsService.GetCallByIdAsync(callId);
+
+			if (model.Call == null || model.Call.DepartmentId != DepartmentId)
+				Unauthorized();
+
 			model.Call = await _callsService.PopulateCallData(model.Call, true, true, true, true, true, true, true, true, true);
 			model.CallPriority = model.Call.Priority;
 			model = await FillUpdateCallView(model);
@@ -2263,7 +2267,7 @@ private async Task<ViewCallView> FillViewCallView(ViewCallView model)
 			var ungroupedUsers = from u in allUsers
 								 where !(groupedUserIds.Contains(u.UserId))
 								 select u;
-			
+
 			foreach (var u in ungroupedUsers)
 			{
 				model.UnGroupedUsers.Add(allUsers.Where(x => x.UserId == u.UserId).FirstOrDefault());

Web/Resgrid.Web/Areas/User/Controllers/ShiftsController.cs

@@ -1223,8 +1223,8 @@ public async Task<IActionResult> GetPersonnelForShift(int shiftId, int? groupId)
 			var shift = await _shiftsService.GetShiftByIdAsync(shiftId);
 			var group = await _departmentGroupsService.GetAllGroupsForDepartmentAsync(DepartmentId);
 
-			if (shift.DepartmentId != DepartmentId)
-				return null;
+			if (shift == null || shift.DepartmentId != DepartmentId)
+				return Json(usersJson);
 
 			shift = await _shiftsService.PopulateShiftData(shift, true, true, true, true, true);