Bug Fix #97 - Removed Organisation Address References

Remove Device Profile references to an address when its removed, and
anticipate missing addresses where referenced.
This commit is contained in:
Gary Sharp
2016-11-03 16:47:07 +11:00
parent 3e4dda683d
commit 6df2e16a7f
7 changed files with 29 additions and 22 deletions
@@ -270,7 +270,7 @@ namespace Disco.Services
j.OpenedTechUserFriendlyId = ActiveDirectory.FriendlyAccountId(j.OpenedTechUserId);
if (j.DeviceAddressId.HasValue)
j.DeviceAddress = Database.DiscoConfiguration.OrganisationAddresses.GetAddress(j.DeviceAddressId.Value).Name;
j.DeviceAddress = Database.DiscoConfiguration.OrganisationAddresses.GetAddress(j.DeviceAddressId.Value)?.Name;
}
return items;
@@ -53,9 +53,7 @@ namespace Disco.Services.Jobs.Noticeboards
if (DeviceAddressId.HasValue)
{
var config = new OrganisationAddressesConfiguration(null);
var address = config.GetAddress(DeviceAddressId.Value);
if (address != null)
return address.ShortName;
return config.GetAddress(DeviceAddressId.Value)?.ShortName;
}
return null;