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

Remove: 'Active' Device property

Browse Source 
No longer needed.
This commit is contained in:
Gary Sharp
2013-02-21 18:25:46 +11:00
parent 20a12c1c99
commit 9e2f9a646f
10 changed files with 437 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/DeviceBI/Enrol.cs
-2
View File
@@ -256,7 +256,6 @@ namespace Disco.BI.DeviceBI
DeviceProfile = deviceProfile,
DeviceModel = deviceModel,
AllowUnauthenticatedEnrol = false,
Active = true,
CreatedDate = DateTime.Now,
EnrolledDate = DateTime.Now
};
@@ -393,7 +392,6 @@ namespace Disco.BI.DeviceBI
DeviceProfile = deviceProfile,
DeviceModel = deviceModel,
AllowUnauthenticatedEnrol = false,
Active = true,
CreatedDate = DateTime.Now,
EnrolledDate = DateTime.Now,
LastEnrolDate = DateTime.Now
Disco.BI/BI/Extensions/DeviceExtensions.cs
-1
View File
@@ -114,7 +114,6 @@ namespace Disco.BI.Extensions
DeviceProfileId = d.DeviceProfileId,
DeviceProfile = dbContext.DeviceProfiles.Find(d.DeviceProfileId),
AllowUnauthenticatedEnrol = true,
Active = true,
DeviceModelId = dm.Id,
DeviceModel = dm,
DeviceBatchId = d.DeviceBatchId,
Disco.Data/Disco.Data.csproj
+8 -1
View File
@@ -93,6 +93,10 @@
<Compile Include="Migrations\201301150107063_DBv6.Designer.cs">
<DependentUpon>201301150107063_DBv6.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201302210057463_DBv7.cs" />
<Compile Include="Migrations\201302210057463_DBv7.Designer.cs">
<DependentUpon>201302210057463_DBv7.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Migrations\DiscoDataMigrator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -124,6 +128,9 @@
<EmbeddedResource Include="Migrations\201301150107063_DBv6.resx">
<DependentUpon>201301150107063_DBv6.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201302210057463_DBv7.resx">
<DependentUpon>201302210057463_DBv7.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -137,7 +144,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_StartDate="2001/1/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="True" BuildVersion_BuildAction="ReBuild" />
<UserProperties BuildVersion_BuildAction="ReBuild" BuildVersion_UseGlobalSettings="True" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2001/1/1" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Data/Migrations/201302210057463_DBv7.Designer.cs
Generated
+27
View File
@@ -0,0 +1,27 @@
// <auto-generated />
namespace Disco.Data.Migrations
{
using System.Data.Entity.Migrations;
using System.Data.Entity.Migrations.Infrastructure;
using System.Resources;
public sealed partial class DBv7 : IMigrationMetadata
{
private readonly ResourceManager Resources = new ResourceManager(typeof(DBv7));
string IMigrationMetadata.Id
{
get { return "201302210057463_DBv7"; }
}
string IMigrationMetadata.Source
{
get { return null; }
}
string IMigrationMetadata.Target
{
get { return Resources.GetString("Target"); }
}
}
}
Disco.Data/Migrations/201302210057463_DBv7.cs
+18
View File
@@ -0,0 +1,18 @@
namespace Disco.Data.Migrations
{
using System;
using System.Data.Entity.Migrations;
public partial class DBv7 : DbMigration
{
public override void Up()
{
DropColumn("dbo.Devices", "Active");
}
public override void Down()
{
AddColumn("dbo.Devices", "Active", c => c.Boolean(nullable: false));
}
}
}
Disco.Data/Migrations/201302210057463_DBv7.resx
+123
View File
File diff suppressed because one or more lines are too long
Disco.Data/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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.0219.1854")]
[assembly: AssemblyFileVersion("1.2.0219.1854")]
[assembly: AssemblyVersion("1.2.0221.1820")]
[assembly: AssemblyFileVersion("1.2.0221.1820")]
Disco.Models/Disco.Models.csproj
+3 -1
View File
@@ -96,6 +96,8 @@
<Compile Include="Repository\User\User.cs" />
<Compile Include="Repository\User\UserAttachment.cs" />
<Compile Include="Repository\User\UserDetail.cs" />
<Compile Include="UI\BaseUIModel.cs" />
<Compile Include="UI\Job\JobShowModel.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
@@ -103,7 +105,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_BuildAction="ReBuild" BuildVersion_UseGlobalSettings="True" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2001/1/1" />
<UserProperties BuildVersion_StartDate="2001/1/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="True" BuildVersion_BuildAction="ReBuild" />
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
Disco.Models/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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.0219.1854")]
[assembly: AssemblyFileVersion("1.2.0219.1854")]
[assembly: AssemblyVersion("1.2.0221.1820")]
[assembly: AssemblyFileVersion("1.2.0221.1820")]
Disco.Models/Repository/Device/Device.cs
+3 -1
View File
@@ -33,7 +33,9 @@ namespace Disco.Models.Repository
public bool AllowUnauthenticatedEnrol { get; set; }
public bool Active { get; set; }
// Removed 2013-02-21 G#: Redundant - See DecommissionedDate
//public bool Active { get; set; }
// End Removed 2013-02-21
public DateTime CreatedDate { get; set; }
public DateTime? EnrolledDate { get; set; }