From 0914a85be6a24596356ec8699074fd8e747a4bf4 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 13 May 2013 14:05:58 +1000 Subject: [PATCH] Fix: Managed Job List Subscription Modified properties are now never 'null' --- Disco.BI/BI/JobBI/ManagedJobList.cs | 7 +++---- Disco.BI/Properties/AssemblyInfo.cs | 4 ++-- Disco.Client/Properties/AssemblyInfo.cs | 4 ++-- Disco.ClientBootstrapper/Properties/AssemblyInfo.cs | 4 ++-- Disco.Data/Properties/AssemblyInfo.cs | 4 ++-- Disco.Data/Repository/Monitor/RepositoryMonitor.cs | 4 +++- Disco.Models/Properties/AssemblyInfo.cs | 4 ++-- Disco.Services/Properties/AssemblyInfo.cs | 4 ++-- Disco.Web.Extensions/Properties/AssemblyInfo.cs | 4 ++-- Disco.Web/Properties/AssemblyInfo.cs | 4 ++-- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Disco.BI/BI/JobBI/ManagedJobList.cs b/Disco.BI/BI/JobBI/ManagedJobList.cs index 8f858994..606b2fac 100644 --- a/Disco.BI/BI/JobBI/ManagedJobList.cs +++ b/Disco.BI/BI/JobBI/ManagedJobList.cs @@ -37,10 +37,9 @@ namespace Disco.BI.JobBI n.EntityType == typeof(JobMetaInsurance) || (n.EventType == RepositoryMonitorEventType.Modified && ( (n.EntityType == typeof(DeviceProfile) && n.ModifiedProperties.Contains("DefaultOrganisationAddress")) || - (n.EntityType == typeof(DeviceModel) && n.ModifiedProperties.Contains("Description")) - )) || - (n.EntityType == typeof(Device) && n.ModifiedProperties.Contains("DeviceProfileId") || n.ModifiedProperties.Contains("DeviceModelId")) - ) + (n.EntityType == typeof(DeviceModel) && n.ModifiedProperties.Contains("Description")) || + (n.EntityType == typeof(Device) && n.ModifiedProperties.Contains("DeviceProfileId") || n.ModifiedProperties.Contains("DeviceModelId")) + ))) .Subscribe(JobNotification); return this; diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index 246b7237..68ba3b30 100644 --- a/Disco.BI/Properties/AssemblyInfo.cs +++ b/Disco.BI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0509.1622")] -[assembly: AssemblyFileVersion("1.2.0509.1622")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index 4d4e0891..675a292b 100644 --- a/Disco.Client/Properties/AssemblyInfo.cs +++ b/Disco.Client/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0513.1327")] -[assembly: AssemblyFileVersion("1.2.0513.1327")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index d34da7cc..914ffec4 100644 --- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs +++ b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0509.1618")] -[assembly: AssemblyFileVersion("1.2.0509.1618")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index 6a22b20c..097df3a4 100644 --- a/Disco.Data/Properties/AssemblyInfo.cs +++ b/Disco.Data/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0513.1327")] -[assembly: AssemblyFileVersion("1.2.0513.1327")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.Data/Repository/Monitor/RepositoryMonitor.cs b/Disco.Data/Repository/Monitor/RepositoryMonitor.cs index 8a7aa3d4..95ffdae4 100644 --- a/Disco.Data/Repository/Monitor/RepositoryMonitor.cs +++ b/Disco.Data/Repository/Monitor/RepositoryMonitor.cs @@ -110,9 +110,11 @@ namespace Disco.Data.Repository.Monitor entityType = EntityTypeFromProxy(entryState.Entity.GetType()); - // Only pass modified properties on Modified Event (Ignore Added/Deleted) + // Only pass modified properties on Modified Event if (eventType == RepositoryMonitorEventType.Modified) modifiedProperties = entryState.GetModifiedProperties().ToArray(); + else + modifiedProperties = new string[] { }; // Empty array for Added/Deleted. // Don't pass entity key when entity newly added if (eventType != RepositoryMonitorEventType.Added) diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 516d370d..58b2b4d6 100644 --- a/Disco.Models/Properties/AssemblyInfo.cs +++ b/Disco.Models/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0513.1327")] -[assembly: AssemblyFileVersion("1.2.0513.1327")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index 27e53102..52d474f8 100644 --- a/Disco.Services/Properties/AssemblyInfo.cs +++ b/Disco.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0513.1327")] -[assembly: AssemblyFileVersion("1.2.0513.1327")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index b4f1c468..2f2543b4 100644 --- a/Disco.Web.Extensions/Properties/AssemblyInfo.cs +++ b/Disco.Web.Extensions/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0513.1327")] -[assembly: AssemblyFileVersion("1.2.0513.1327")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs index 770a56b2..555f62ba 100644 --- a/Disco.Web/Properties/AssemblyInfo.cs +++ b/Disco.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.0513.1327")] -[assembly: AssemblyFileVersion("1.2.0513.1327")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1342")] +[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file