Feature #19: Allow auto unauthenticated enrolment

Disco.BI/BI/DeviceBI/Enrol.cs

@@ -356,9 +356,23 @@ namespace Disco.BI.DeviceBI
                 else
                 {
                     if (RepoDevice == null)
+                    {
                         throw new EnrolSafeException(string.Format("Unknown Device Serial Number (SN: '{0}')", Request.DeviceSerialNumber));
+                    }
                     if (!RepoDevice.AllowUnauthenticatedEnrol)
-                        throw new EnrolSafeException(string.Format("Device isn't allowed an Unauthenticated Enrolment (SN: '{0}')", Request.DeviceSerialNumber));
+                    {
+                        if (RepoDevice.DeviceProfile.AllowUntrustedReimageJobEnrolment)
+                        {
+                            if (Database.Jobs.Count(j => j.DeviceSerialNumber == RepoDevice.SerialNumber && j.JobTypeId == JobType.JobTypeIds.SImg && !j.ClosedDate.HasValue) == 0)
+                            {
+                                throw new EnrolSafeException(string.Format("Device has no open 'Software - Reimage' job (SN: '{0}')", Request.DeviceSerialNumber));
+                            }
+                        }
+                        else
+                        {
+                            throw new EnrolSafeException(string.Format("Device isn't allowed an Unauthenticated Enrolment (SN: '{0}')", Request.DeviceSerialNumber));
+                        }
+                    }
                 }
                 if (Request.DeviceIsPartOfDomain && !string.IsNullOrWhiteSpace(Request.DeviceComputerName))
                 {

Disco.Data/Disco.Data.csproj

@@ -122,6 +122,10 @@
     <Compile Include="Migrations\201310280657528_DBv10.Designer.cs">
       <DependentUpon>201310280657528_DBv10.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\201310282325491_DBv11.cs" />
+    <Compile Include="Migrations\201310282325491_DBv11.Designer.cs">
+      <DependentUpon>201310282325491_DBv11.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Migrations\DiscoDataMigrator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -167,6 +171,9 @@
     <EmbeddedResource Include="Migrations\201310280657528_DBv10.resx">
       <DependentUpon>201310280657528_DBv10.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\201310282325491_DBv11.resx">
+      <DependentUpon>201310282325491_DBv11.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -180,7 +187,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
+      <UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

Disco.Data/Migrations/201310282325491_DBv11.Designer.cs

@@ -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 DBv11 : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(DBv11));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "201310282325491_DBv11"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

Disco.Data/Migrations/201310282325491_DBv11.cs

@@ -0,0 +1,18 @@
+namespace Disco.Data.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class DBv11 : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.DeviceProfiles", "AllowUntrustedReimageJobEnrolment", c => c.Boolean(nullable: false, defaultValue: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.DeviceProfiles", "AllowUntrustedReimageJobEnrolment");
+        }
+    }
+}

Disco.Data/Migrations/201310282325491_DBv11.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Target" xml:space="preserve">
+    <value>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 truncated
+  </data>
+</root>

Disco.Models/Repository/Device/DeviceProfile.cs

@@ -45,6 +45,8 @@ namespace Disco.Models.Repository
 
         public bool AssignedUserLocalAdmin { get; set; }
 
+        public bool AllowUntrustedReimageJobEnrolment { get; set; }
+
         public virtual IList<Device> Devices { get; set; }
 
         public override string ToString()

Disco.Web/Areas/API/Controllers/DeviceProfileController.cs

@@ -23,6 +23,7 @@ namespace Disco.Web.Areas.API.Controllers
         const string pEnforceOrganisationalUnit = "enforceorganisationalunit";
         const string pProvisionADAccount = "provisionadaccount";
         const string pAssignedUserLocalAdmin = "assigneduserlocaladmin";
+        const string pAllowUntrustedReimageJobEnrolment = "allowuntrustedreimagejobrnrolment";
 
         [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
         public virtual ActionResult Update(int id, string key, string value = null, Nullable<bool> redirect = null)
@@ -77,6 +78,9 @@ namespace Disco.Web.Areas.API.Controllers
                         case pAssignedUserLocalAdmin:
                             UpdateAssignedUserLocalAdmin(deviceProfile, value);
                             break;
+                        case pAllowUntrustedReimageJobEnrolment:
+                            UpdateAllowUntrustedReimageJobEnrolment(deviceProfile, value);
+                            break;
                         default:
                             throw new Exception("Invalid Update Key");
                     }
@@ -173,6 +177,11 @@ namespace Disco.Web.Areas.API.Controllers
             return Update(id, pAssignedUserLocalAdmin, AssignedUserLocalAdmin, redirect);
         }
 
+        [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]
+        public virtual ActionResult UpdateAllowUntrustedReimageJobEnrolment(int id, string AllowUntrustedReimageJobEnrolment = null, Nullable<bool> redirect = null)
+        {
+            return Update(id, pAllowUntrustedReimageJobEnrolment, AllowUntrustedReimageJobEnrolment, redirect);
+        }
         #endregion
 
         #region Update Properties
@@ -340,6 +349,19 @@ namespace Disco.Web.Areas.API.Controllers
             }
             throw new Exception("Invalid Boolean Value");
         }
+
+        private void UpdateAllowUntrustedReimageJobEnrolment(DeviceProfile deviceProfile, string AllowUntrustedReimageJobEnrolment)
+        {
+            bool bValue;
+            if (bool.TryParse(AllowUntrustedReimageJobEnrolment, out bValue))
+            {
+                deviceProfile.AllowUntrustedReimageJobEnrolment = bValue;
+
+                Database.SaveChanges();
+                return;
+            }
+            throw new Exception("Invalid Boolean Value");
+        }
         #endregion
 
         [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)]

Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml

@@ -14,10 +14,10 @@
         Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
     }
 }
-<div id="configurationDeviceProfileShow" class="form" style="width: 600px">
+<div id="configurationDeviceProfileShow" class="form" style="width: 640px">
     <table>
         <tr>
-            <th style="width: 230px;">Id:
+            <th style="width: 170px;">Id:
             </th>
             <td>
                 @Html.DisplayFor(model => model.DeviceProfile.Id)
@@ -322,7 +322,7 @@
             </td>
         </tr>
         <tr>
-            <th>Computer Name Template Expression:
+            <th>Computer Name<br />Template Expression:
             </th>
             <td>@if (canConfig && canConfigExpression)
                 {
@@ -371,16 +371,16 @@
                 }
                 else
                 {
-                    if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate))
+                <div id="displayComputerNameTemplate" class="code">
+                    @if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate))
                     {
-                <span class="smallMessage">&lt;None Specified&gt;</span>
+                        <span class="smallMessage">&lt;None Specified&gt;</span>
                     }
                     else
                     {
-                <div class="code">
+                        @Model.DeviceProfile.ComputerNameTemplate
-                    @Model.DeviceProfile.ComputerNameTemplate
-                </div>
                     }
+                </div>
                 }
                 <div style="margin-top: 8px;">
                     @if (canConfig)
@@ -419,7 +419,7 @@
             </td>
         </tr>
         <tr>
-            <th>Active Directory</th>
+            <th>Policies</th>
             <td>
                 <div>
                     @if (canConfig)
@@ -483,6 +483,37 @@
                     </label>
                     @AjaxHelpers.AjaxLoader()
                 </div>
+                <div style="margin-top: 8px;">
+                    @if (canConfig)
+                    {
+                        <input id="DeviceProfile_AllowUntrustedReimageJobEnrolment" type="checkbox" @(Model.DeviceProfile.AllowUntrustedReimageJobEnrolment ? new MvcHtmlString("checked=\"checked\" ") : null)/>
+                        <script type="text/javascript">
+                            $(function () {
+                                $('#DeviceProfile_AllowUntrustedReimageJobEnrolment').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.nextAll('.ajaxLoading').show();
+                                    var data = { AllowUntrustedReimageJobEnrolment: $this.is(':checked') };
+                                    $.getJSON('@Url.Action(MVC.API.DeviceProfile.UpdateAllowUntrustedReimageJobEnrolment(Model.DeviceProfile.Id))', data, function (response, result) {
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to change Allow Untrusted Reimage Job Enrolment:\n' + response);
+                                            $ajaxLoading.hide();
+                                        } else {
+                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    });
+                                });
+                            });
+                        </script>
+                    }
+                    else
+                    {
+                        <input id="DeviceProfile_AllowUntrustedReimageJobEnrolment" type="checkbox" @(Model.DeviceProfile.AllowUntrustedReimageJobEnrolment ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
+                    }
+                    <label for="DeviceProfile_AllowUntrustedReimageJobEnrolment">
+                        Allow Untrusted Enrolment Where a <span class="code">'Software - Reimage'</span> Job is Open
+                    </label>
+                    @AjaxHelpers.AjaxLoader()
+                </div>
             </td>
         </tr>
         <tr>
@@ -491,9 +522,9 @@
             <td>@if (canConfig)
                 {
                 @Html.HiddenFor(model => model.DeviceProfile.OrganisationalUnit)
-                <div id="displayOrganisationalUnit">
+                <div id="displayOrganisationalUnit" class="code">
                 </div>
-                <a id="changeOrganisationalUnit" href="#">Change</a>@AjaxHelpers.AjaxLoader()
+                <a id="changeOrganisationalUnit" href="#" class="button small">Change</a>@AjaxHelpers.AjaxLoader()
                 <div id="dialogOrganisationalUnit" title="Default Organisational Unit">
                     <div id="treeOrganisationalUnit">
                     </div>
@@ -610,16 +641,18 @@
                 }
                 else
                 {
-                    if (string.IsNullOrEmpty(Model.DeviceProfile.OrganisationalUnit))
+                <div id="displayOrganisationalUnit" class="code">
+                    @if (string.IsNullOrEmpty(Model.DeviceProfile.OrganisationalUnit))
                     {
-                <span>{Default Computers Container}</span>
+                        <span>{Default Computers Container}</span>
                     }
                     else
                     {
-                <span>
+                        <span>
-                    @string.Join(" > ", Model.DeviceProfile.OrganisationalUnit.Split(',').Select(s => s.Substring(3)).Reverse())
+                            @string.Join(" > ", Model.DeviceProfile.OrganisationalUnit.Split(',').Select(s => s.Substring(3)).Reverse())
-                </span>
+                        </span>
                     }
+                </div>
                 }
                 <div style="margin-top: 8px;">
                     @if (canConfig)

Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs

@@ -68,11 +68,11 @@ WriteLiteral(" id=\"configurationDeviceProfileShow\"");
 
 WriteLiteral(" class=\"form\"");
 
-WriteLiteral(" style=\"width: 600px\"");
+WriteLiteral(" style=\"width: 640px\"");
 
 WriteLiteral(">\r\n    <table>\r\n        <tr>\r\n            <th");
 
-WriteLiteral(" style=\"width: 230px;\"");
+WriteLiteral(" style=\"width: 170px;\"");
 
 WriteLiteral(">Id:\r\n            </th>\r\n            <td>\r\n");
 
@@ -895,8 +895,8 @@ WriteLiteral(">&lt;None Allocated&gt;</span>\r\n");
             
             #line default
             #line hidden
-WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Computer Name Tem" +
+WriteLiteral("            </td>\r\n        </tr>\r\n        <tr>\r\n            <th>Computer Name<br " +
-"plate Expression:\r\n            </th>\r\n            <td>");
+"/>Template Expression:\r\n            </th>\r\n            <td>");
 
             
             #line 327 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
@@ -952,14 +952,14 @@ WriteLiteral("                <a");
 
 WriteLiteral(" id=\"expressionBrowserAnchor\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 16256), Tuple.Create("\"", 16325)
+WriteAttribute("href", Tuple.Create(" href=\"", 16261), Tuple.Create("\"", 16330)
             
             #line 332 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 16263), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
+, Tuple.Create(Tuple.Create("", 16268), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
             
             #line default
             #line hidden
-, 16263), false)
+, 16268), false)
 );
 
 WriteLiteral(">&nbsp;</a>\r\n");
@@ -1022,20 +1022,40 @@ WriteLiteral(@"',
                 }
                 else
                 {
-                    if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate))
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
+
+WriteLiteral(" id=\"displayComputerNameTemplate\"");
+
+WriteLiteral(" class=\"code\"");
+
+WriteLiteral(">\r\n");
+
+            
+            #line 375 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 375 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                     if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate))
                     {
 
             
             #line default
             #line hidden
-WriteLiteral("                <span");
+WriteLiteral("                        <span");
 
 WriteLiteral(" class=\"smallMessage\"");
 
 WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
 
             
-            #line 377 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 378 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     }
                     else
                     {
@@ -1043,26 +1063,25 @@ WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
             
             #line default
             #line hidden
-WriteLiteral("                <div");
-
-WriteLiteral(" class=\"code\"");
-
-WriteLiteral(">\r\n");
-
-WriteLiteral("                    ");
-
             
             #line 381 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-               Write(Model.DeviceProfile.ComputerNameTemplate);
+                   Write(Model.DeviceProfile.ComputerNameTemplate);
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </div>\r\n");
             
+            #line 381 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                  
-            #line 383 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 384 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                 }
 
             
@@ -1192,16 +1211,10 @@ WriteLiteral(" class=\"smallMessage\"");
 
 WriteLiteral(" style=\"margin-top: 8px;\"");
 
-WriteLiteral(@">
+WriteLiteral(">\r\n                    Note: Computer names are only changed when Active Director" +
-                    Note: Computer names are only changed when Active Directory accounts are provisioned.
+"y accounts are provisioned.\r\n                </div>\r\n            </td>\r\n        " +
-                </div>
+"</tr>\r\n        <tr>\r\n            <th>Policies</th>\r\n            <td>\r\n          " +
-            </td>
+"      <div>\r\n");
-        </tr>
-        <tr>
-            <th>Active Directory</th>
-            <td>
-                <div>
-");
 
             
             #line 425 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
@@ -1431,13 +1444,134 @@ WriteLiteral("                    ");
                Write(AjaxHelpers.AjaxLoader());
 
             
+            #line default
+            #line hidden
+WriteLiteral("\r\n                </div>\r\n                <div");
+
+WriteLiteral(" style=\"margin-top: 8px;\"");
+
+WriteLiteral(">\r\n");
+
+            
+            #line 487 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 487 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                     if (canConfig)
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
+
+WriteLiteral(" id=\"DeviceProfile_AllowUntrustedReimageJobEnrolment\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 489 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                Write(Model.DeviceProfile.AllowUntrustedReimageJobEnrolment ? new MvcHtmlString("checked=\"checked\" ") : null);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("/>\r\n");
+
+WriteLiteral("                        <script");
+
+WriteLiteral(" type=\"text/javascript\"");
+
+WriteLiteral(@">
+                            $(function () {
+                                $('#DeviceProfile_AllowUntrustedReimageJobEnrolment').click(function () {
+                                    var $this = $(this);
+                                    var $ajaxLoading = $this.nextAll('.ajaxLoading').show();
+                                    var data = { AllowUntrustedReimageJobEnrolment: $this.is(':checked') };
+                                    $.getJSON('");
+
+            
+            #line 496 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                          Write(Url.Action(MVC.API.DeviceProfile.UpdateAllowUntrustedReimageJobEnrolment(Model.DeviceProfile.Id)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"', data, function (response, result) {
+                                        if (result != 'success' || response != 'OK') {
+                                            alert('Unable to change Allow Untrusted Reimage Job Enrolment:\n' + response);
+                                            $ajaxLoading.hide();
+                                        } else {
+                                            $ajaxLoading.hide().next('.ajaxOk').show().delay('fast').fadeOut('slow');
+                                        }
+                                    });
+                                });
+                            });
+                        </script>
+");
+
+            
+            #line 507 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+                    else
+                    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                        <input");
+
+WriteLiteral(" id=\"DeviceProfile_AllowUntrustedReimageJobEnrolment\"");
+
+WriteLiteral(" type=\"checkbox\"");
+
+WriteLiteral(" ");
+
+            
+            #line 510 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                                                                                                Write(Model.DeviceProfile.AllowUntrustedReimageJobEnrolment ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(" disabled=\"disabled\" />\r\n");
+
+            
+            #line 511 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    <label");
+
+WriteLiteral(" for=\"DeviceProfile_AllowUntrustedReimageJobEnrolment\"");
+
+WriteLiteral(">\r\n                        Allow Untrusted Enrolment Where a <span");
+
+WriteLiteral(" class=\"code\"");
+
+WriteLiteral(">\'Software - Reimage\'</span> Job is Open\r\n                    </label>\r\n");
+
+WriteLiteral("                    ");
+
+            
+            #line 515 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+               Write(AjaxHelpers.AjaxLoader());
+
+            
             #line default
             #line hidden
 WriteLiteral("\r\n                </div>\r\n            </td>\r\n        </tr>\r\n        <tr>\r\n       " +
 "     <th>Default Organisational Unit:\r\n            </th>\r\n            <td>");
 
             
-            #line 491 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 522 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                  if (canConfig)
                 {
                 
@@ -1445,14 +1579,14 @@ WriteLiteral("\r\n                </div>\r\n            </td>\r\n        </tr>\r
             #line default
             #line hidden
             
-            #line 493 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 524 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
            Write(Html.HiddenFor(model => model.DeviceProfile.OrganisationalUnit));
 
             
             #line default
             #line hidden
             
-            #line 493 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 524 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                 
 
             
@@ -1462,6 +1596,8 @@ WriteLiteral("                <div");
 
 WriteLiteral(" id=\"displayOrganisationalUnit\"");
 
+WriteLiteral(" class=\"code\"");
+
 WriteLiteral(">\r\n                </div>\r\n");
 
 WriteLiteral("                <a");
@@ -1470,23 +1606,25 @@ WriteLiteral(" id=\"changeOrganisationalUnit\"");
 
 WriteLiteral(" href=\"#\"");
 
+WriteLiteral(" class=\"button small\"");
+
 WriteLiteral(">Change</a>");
 
             
-            #line 496 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 527 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                          
             
             #line default
             #line hidden
             
-            #line 496 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 527 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-                                                               Write(AjaxHelpers.AjaxLoader());
+                                                                                    Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
             
-            #line 496 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 527 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                                                   
 
             
@@ -1532,7 +1670,7 @@ WriteLiteral(@">
                             $.getJSON('");
 
             
-            #line 522 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 553 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                   Write(Url.Action(MVC.API.DeviceProfile.UpdateOrganisationalUnit(Model.DeviceProfile.Id, null)));
 
             
@@ -1573,7 +1711,7 @@ WriteLiteral("\', data, function (response, result) {\r\n
 "getJSON(\'");
 
             
-            #line 571 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 602 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                        Write(Url.Action(MVC.API.DeviceProfile.OrganisationalUnits()));
 
             
@@ -1606,20 +1744,40 @@ WriteLiteral("\', null, function (data) {\r\n                                var
 "             });\r\n                </script>\r\n");
 
             
-            #line 610 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 641 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                 }
                 else
                 {
-                    if (string.IsNullOrEmpty(Model.DeviceProfile.OrganisationalUnit))
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <div");
+
+WriteLiteral(" id=\"displayOrganisationalUnit\"");
+
+WriteLiteral(" class=\"code\"");
+
+WriteLiteral(">\r\n");
+
+            
+            #line 645 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                    
+            
+            #line default
+            #line hidden
+            
+            #line 645 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+                     if (string.IsNullOrEmpty(Model.DeviceProfile.OrganisationalUnit))
                     {
 
             
             #line default
             #line hidden
-WriteLiteral("                <span>{Default Computers Container}</span>\r\n");
+WriteLiteral("                        <span>{Default Computers Container}</span>\r\n");
 
             
-            #line 616 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 648 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     }
                     else
                     {
@@ -1627,22 +1785,30 @@ WriteLiteral("                <span>{Default Computers Container}</span>\r\n");
             
             #line default
             #line hidden
-WriteLiteral("                <span>\r\n");
+WriteLiteral("                        <span>\r\n");
 
-WriteLiteral("                    ");
+WriteLiteral("                            ");
 
             
-            #line 620 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 652 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
-               Write(string.Join(" > ", Model.DeviceProfile.OrganisationalUnit.Split(',').Select(s => s.Substring(3)).Reverse()));
+                       Write(string.Join(" > ", Model.DeviceProfile.OrganisationalUnit.Split(',').Select(s => s.Substring(3)).Reverse()));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                </span>\r\n");
+WriteLiteral("\r\n                        </span>\r\n");
 
             
-            #line 622 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 654 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                </div>\r\n");
+
+            
+            #line 656 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                 }
 
             
@@ -1655,13 +1821,13 @@ WriteLiteral(" style=\"margin-top: 8px;\"");
 WriteLiteral(">\r\n");
 
             
-            #line 625 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 658 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 625 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 658 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                      if (canConfig)
                     {
 
@@ -1677,7 +1843,7 @@ WriteLiteral(" type=\"checkbox\"");
 WriteLiteral(" ");
 
             
-            #line 627 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 660 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                         Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
 
             
@@ -1698,7 +1864,7 @@ WriteLiteral(@">
                                     $.getJSON('");
 
             
-            #line 634 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 667 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                           Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceOrganisationalUnit(Model.DeviceProfile.Id)));
 
             
@@ -1718,7 +1884,7 @@ WriteLiteral(@"', data, function (response, result) {
 ");
 
             
-            #line 645 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 678 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     }
                     else
                     {
@@ -1735,7 +1901,7 @@ WriteLiteral(" type=\"checkbox\"");
 WriteLiteral(" ");
 
             
-            #line 648 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 681 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                         Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty));
 
             
@@ -1744,7 +1910,7 @@ WriteLiteral(" ");
 WriteLiteral(" disabled=\"disabled\" />\r\n");
 
             
-            #line 649 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 682 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                     }
 
             
@@ -1760,7 +1926,7 @@ WriteLiteral(">\r\n                        Enforce Organisational Unit\r\n
 WriteLiteral("                    ");
 
             
-            #line 653 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 686 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                Write(AjaxHelpers.AjaxLoader());
 
             
@@ -1770,7 +1936,7 @@ WriteLiteral("\r\n                </div>\r\n            </td>\r\n        </tr>\r
 "\n");
 
             
-            #line 659 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 692 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
  if (canDelete)
 {
 
@@ -1827,7 +1993,7 @@ WriteLiteral(@">
 ");
 
             
-            #line 695 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 728 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
 }
 
             
@@ -1840,13 +2006,13 @@ WriteLiteral(" class=\"actionBar\"");
 WriteLiteral(">\r\n");
 
             
-            #line 697 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 730 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 697 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 730 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
      if (canDelete)
     { 
         
@@ -1854,14 +2020,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 699 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 732 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
    Write(Html.ActionLinkButton("Delete", MVC.API.DeviceProfile.Delete(Model.DeviceProfile.Id, true), "buttonDelete"));
 
             
             #line default
             #line hidden
             
-            #line 699 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 732 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                                                     
     }
 
@@ -1871,7 +2037,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 701 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 734 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
      if (Authorization.Has(Claims.Device.Actions.Export))
     {
         
@@ -1879,14 +2045,14 @@ WriteLiteral("    ");
             #line default
             #line hidden
             
-            #line 703 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 736 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
    Write(Html.ActionLinkButton("Export Devices", MVC.API.DeviceProfile.ExportDevices(Model.DeviceProfile.Id)));
 
             
             #line default
             #line hidden
             
-            #line 703 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 736 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                                              
     }
 
@@ -1896,7 +2062,7 @@ WriteLiteral("    ");
 WriteLiteral("    ");
 
             
-            #line 705 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 738 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
      if (Authorization.Has(Claims.Device.Search))
     {
         
@@ -1904,14 +2070,14 @@ WriteLiteral("    ");
             #line default
             #line hidden
             
-            #line 707 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 740 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
    Write(Html.ActionLinkButton("View Devices", MVC.Search.Query(Model.DeviceProfile.Id.ToString(), "DeviceProfile")));
 
             
             #line default
             #line hidden
             
-            #line 707 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
+            #line 740 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml"
                                                                                                                     
     }
 

Disco.Web/ClientSource/Style/Config.css

@@ -276,6 +276,12 @@ table.deviceProfileTable th.deviceCount {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACKUlEQVQ4jaWTTU4UURDHf/W6gXFgJlHZKFvEe3gBvYhewXgGTXRpOILhGESGgEuNjB9N/BgCTJjufvXhonsQ176kkqpFVf2q6v8kIvifV77b2wsAU6MsCop/LCEpISIkEUAoioSZYWZczOeUp6en1ZPHT+4FQXgQERDBMrZlHACOpIKcM23bMN3fr0pEcDfub21x9/YdIhwR6QoJWFY8wF2JAHfH3fh8MoUISoGugxnPnj1lZ2eHg/cHTL9MMTdy09K0LVkVy8rsbMZkMukpoRQRRBIAZ2czNjbWWV1bZXY2I6WCpq5pmgY1ZXoypaoqAEQSsSQQ6Tb67es3Xr9+Q103PHy4w+Fkgpoxn1/y8eMn6rq+3v4yp0TkOvpeVaytreHuHB4egggXFxdUVUVZrrKxXmJuLBYLut15PwIwGo1IqTuTSGJlJfj1+xdXV1eMx2PCnTZn3B1VRZY6kJ5gc3MTEenO1Cy4nF9SpILxaIya4maUqrgqdU8QEd0IArgbOStFmVFVNCuqirtjalgYboa5A3KDIAJEGA7XiQiauiZnZTgcXhdwM7RXX1ZlsbgCEUTkL8GD7W3UjMGtAUUqMDMiosf3niqTVbk1GLDUT5nV5Oj4A293d1G1647m3qvOb/hGBLRty9HxB8xM5OWrV49+/vj5wuk07x4CEZ2clxcWUuqclFIgiSIJo9Houdz8zufn56siMgBKoACkNwdcRDIRzWg8bpY5fwBYR4lbku/2TAAAAABJRU5ErkJggg==) /*Images/Actions/expressionBrowser.png*/;
   text-decoration: none;
 }
+#configurationDeviceProfileShow #displayComputerNameTemplate {
+  margin: 0 0 6px 0;
+}
+#configurationDeviceProfileShow #displayOrganisationalUnit {
+  margin: 0 0 6px 0;
+}
 #configurationDocumentTemplateExpressionBrowser {
   padding-right: 275px;
   background-image: url(data:image/png;base64,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 truncated

Disco.Web/ClientSource/Style/Config.less

@@ -197,6 +197,14 @@ table.deviceProfileTable {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACKUlEQVQ4jaWTTU4UURDHf/W6gXFgJlHZKFvEe3gBvYhewXgGTXRpOILhGESGgEuNjB9N/BgCTJjufvXhonsQ176kkqpFVf2q6v8kIvifV77b2wsAU6MsCop/LCEpISIkEUAoioSZYWZczOeUp6en1ZPHT+4FQXgQERDBMrZlHACOpIKcM23bMN3fr0pEcDfub21x9/YdIhwR6QoJWFY8wF2JAHfH3fh8MoUISoGugxnPnj1lZ2eHg/cHTL9MMTdy09K0LVkVy8rsbMZkMukpoRQRRBIAZ2czNjbWWV1bZXY2I6WCpq5pmgY1ZXoypaoqAEQSsSQQ6Tb67es3Xr9+Q103PHy4w+Fkgpoxn1/y8eMn6rq+3v4yp0TkOvpeVaytreHuHB4egggXFxdUVUVZrrKxXmJuLBYLut15PwIwGo1IqTuTSGJlJfj1+xdXV1eMx2PCnTZn3B1VRZY6kJ5gc3MTEenO1Cy4nF9SpILxaIya4maUqrgqdU8QEd0IArgbOStFmVFVNCuqirtjalgYboa5A3KDIAJEGA7XiQiauiZnZTgcXhdwM7RXX1ZlsbgCEUTkL8GD7W3UjMGtAUUqMDMiosf3niqTVbk1GLDUT5nV5Oj4A293d1G1647m3qvOb/hGBLRty9HxB8xM5OWrV49+/vj5wuk07x4CEZ2clxcWUuqclFIgiSIJo9Houdz8zufn56siMgBKoACkNwdcRDIRzWg8bpY5fwBYR4lbku/2TAAAAABJRU5ErkJggg==) /*Images/Actions/expressionBrowser.png*/;
         text-decoration: none;
     }
+
+    #displayComputerNameTemplate {
+        margin: 0 0 6px 0;
+    }
+
+    #displayOrganisationalUnit {
+        margin: 0 0 6px 0;
+    }
 }
 
 #configurationDocumentTemplateExpressionBrowser {

Disco.Web/ClientSource/Style/Config.min.css

@@ -1 +1 @@
-.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#pageMenu td .pageMenuArea>a.config{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACsElEQVQ4y41T3UtTcRie3QaNRhKC/4SgN4KBeSGK4EAvuzChNZQSvJgXYldCV5tMiUzEDVuZ84M0P4OmpjO3lV+bs21nH2fnbGd69mFuMz/39DunFsUadODh/Hj5vc/zPu/7/iQAJP9CQ0NDrU6nO9Lr9YnS0tKqfPdyAoODg7daWlpuqFQqYyyeQDKVQmdnp6G9vf26RqO5nZfAYDC0vZ2ezuj0es5oHEuGuQhCYQ7RWAznFxeYmpo6fmkwcCaTKfO8v1/5F4FMJrv26vUIQ7MhxOJxEYc8DzrIgItEcHB4iONkEql0Gqdn5xgdHfXnVFBXV6cNkATK54M/QMNm+4yPq2vY3NqCl8QSR0ci0icnqK6ufppDoO3t3fSRROe+C/PzCyKJ3e64CjLslZC0tLyMyMHPSjQ9PZbfBEqlslar1fIut/uS8vpgtdoQCoVB/NJSqVReWFh4b2FxkY8SW0JVQl88FHXZ19fHl5eXV0kqK++qInwU+y43duwOrJnXQVE+1NfLn2RVHigUAx7KC/P6BulLEH6aJs2No6LiTpukrKzsEcOy2HN+xfbOLlbXzOCjMajV6vdZgiGd7oswlZnZOdj3nAjQhCQQQElJiUJCPmlTU9MsGR1H/GJre0ds1uTkJEZG3nwzGo3HY+Pj4jSsNhu8/gD0w8OskCPk/rl5z1LpE7DE/wfTkjjGXWLJQRRpovhuZgYO5z4pP4iamhp1zhS6u7u572dniCcScHs8sFisWN+w4NMvWIi6QB4ku9LV1RXKIVB1dJjJX1iiDNm+TJjjRL+CqrAfRDlDFusqHDlAa2vrSg6B4KexsXGiqKjofnFx8WNSxalfbBYNyutNkvhDElfI5fIJ4W7ex5TFi4EBF0umwzAMmpubV/77NWZRUFAgI52eE0DON/Pd+wH6O+vw3ozilAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.config:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACiElEQVQ4y41Ta0iTYRQe/ShCTCpJiiRIKvtTiUE3+2VRiMR+JEk3ktKMslmGJZVEf1aZhpFFS/uRQ7Jcq2jVKvKCu2S66eZl05zu5qd9m+5i28TtO73njYXyNeiDw/dyOOc5z3me9xUAgOBfUXYgNUv3+JxH/0Q0lZ22MjNWHS/R9agwsfZU+hL5hZ0vAi4HhLwsKC5lSBuLtsepbx9MignQ/bRENCC7xekkRYyx4brf6zCB194Pv1gbhGeCMNAk9pEaZlgp4Tru5xXOA0hKWLSg59kVu8dqBJyK4R+3wJSlG3xOM/iZHxD0TEDI54LZ4DQYpFdHeAyK96+rxgb3YAdMDevBoZXDaHM9jH1/R3MBt5PGjH8SzmSmiHkAmru5Omz8aWyGwbf3KAijV0YIqwg2WT7XgW9siDJR38n59hdAcjI9S1NxiGX728M4ya5uAo+tF8i+1sT4hcLk5YuPDikesLgWskJdXCZNWFt1hM3ZtjpTcDxjTen0xAiwfW04EUZbpOA2a6Eka315dMrDE2kS0gTWtgaqC7JDcXN3JIsExOMinIjUGd1HCoCA7WLhpygAuQ9d6Ir5TRWM93yhABj7NiUVCMiXUHl4s4JYx6ALTNcHKlZf400w1Jd5Sd7X+/wGdcOueQWTQ52gry12YA/2zr15NWgTsiFeUxtxpQnDVzrNJK+gLPF8dm9KJc+FlvI9zGzAR++Aa0AFNtXLeYHTERxDeXm3kwfw+uIuFReJIABHBOJwZ9yXTv0jHEf+EczX5W9t5QHgPteEG2VrV8Tlpa6KP09YhKJiEVf8JH+a5AtKszfIsDbmY4pGZ02+mVImwlYf29L6369xDqNlROn3GOS8NFbdbzB85s9H8NGVAAAAAElFTkSuQmCC)}#updateAvailableContainer{float:right;border:1px dashed #ddd;background-color:#fff;font-size:.6em;line-height:1em;padding:4px 10px 4px 70px;text-align:right;height:64px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAABACAYAAACz4p94AAAVPUlEQVRo3s2aWaxk13Wev7X3PkONd+6+PQ+cmoNItkha4iCYtBVLpGQ7MkQ78EMICBZt+EFAAENMgAAKkAQInYcEQR6Sl8AKHE1OBBkg2YJFKS0O8iCSgimymyLZTXY3e+471q1bVWfYKw/7nLrVDCkDQQNhNQ7OrdNVe69/Tf9aa5dwLV+P/ycOuE1z8fxZKaa2U4pQYkEBY0m3tZk79pKePXbc8/ZPrtm27pqscvfn4aWnYO+exq5WvqCptUOXMHAJmYkZFYpzMfO7usysnSnOvnnqIpB9tEC89BQArW5zenpK7ugPB+nQRLRtQm4tK3lJZCKmui1ttFt9Ytf76IGoXs00WUib9oHp6dlOZoyU4siNxY9KrHV0Gw1Va5dw9nVg9SMJIo3jxTSJPjnXbc8UYqWwjhzDMCmxxtFsNXQTvUDkvguc/kiCEGsX4ii6ud3tTJXGUIhjKJbesERcRLedMvB+Gmu713LfawoC9Q1nbDrTdHFpHKWxbIil5RTjItrNhEtIijWNjyyIIi8iI0g3TSisozQOVUPTCDZKaDYjBBVEoo8siOFoJKinncTk1lLaiEwtqXNESUI3teABMeYjC2IwGIovSpqxIzeO0jr6RKQupptEbIs8AmBEP7og+hv4vCB2DmsdhYtwGtHEMR8J2xyIEhj8IxvYvR5lNsIaQYxBjMFhaakw42C23k2uLYhr6ptcPJ8x3FQjghXBVEASK7Ss0A67KSvr2TW1xF9897uRM/aPW63mnla7U7Zb7bC5UN0FEETkqmfhOUglrBHDn3z32cM220yCpDJWuAGsASuQRK79L77y2Jef+Mf/40EFUdlaQyb2kbAZBkFRijwnyzLyoiDPMrJwRXme/5UzmEjEfBkxtwqCMeHaEnTr76ufT2wuAqIcmmlxYZDhvWppVEpVCpQcyD1kHk0i17hp1/bfCZKCqdarARgRMBPPjCAalBeAMt5bVVHV0llr1BjJjAhxHBEnCda6qzRvEMSAiA2LimDEhA3HloDIOWBEXnopjacsPUP19MXQK6HnEUWI4pi02awiPAgKEnxbggWlAmOqTxljq2ASvCp5ntcgCmeMwVpLmjb43z/8AUl+kZgMjEHiGfCKiWJwCUWRUSKIsYhmCAXYFCmGiHpeO9OnffAuhmVJQYliGPmCnhiuGEvHwWiwyQ/+15+z9uPv4FUxrS6MelDm+NYUuBhrLNYlaL+HZhkap2AU1ZCieyPLdTffwaFDN6GqODGVyQRmZ2f4/V/7OKkbgFho7YM8g7QFaYdvP3+MYxeWKLLine truncated
+.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}#pageMenu td .pageMenuArea>a.config{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACsElEQVQ4y41T3UtTcRie3QaNRhKC/4SgN4KBeSGK4EAvuzChNZQSvJgXYldCV5tMiUzEDVuZ84M0P4OmpjO3lV+bs21nH2fnbGd69mFuMz/39DunFsUadODh/Hj5vc/zPu/7/iQAJP9CQ0NDrU6nO9Lr9YnS0tKqfPdyAoODg7daWlpuqFQqYyyeQDKVQmdnp6G9vf26RqO5nZfAYDC0vZ2ezuj0es5oHEuGuQhCYQ7RWAznFxeYmpo6fmkwcCaTKfO8v1/5F4FMJrv26vUIQ7MhxOJxEYc8DzrIgItEcHB4iONkEql0Gqdn5xgdHfXnVFBXV6cNkATK54M/QMNm+4yPq2vY3NqCl8QSR0ci0icnqK6ufppDoO3t3fSRROe+C/PzCyKJ3e64CjLslZC0tLyMyMHPSjQ9PZbfBEqlslar1fIut/uS8vpgtdoQCoVB/NJSqVReWFh4b2FxkY8SW0JVQl88FHXZ19fHl5eXV0kqK++qInwU+y43duwOrJnXQVE+1NfLn2RVHigUAx7KC/P6BulLEH6aJs2No6LiTpukrKzsEcOy2HN+xfbOLlbXzOCjMajV6vdZgiGd7oswlZnZOdj3nAjQhCQQQElJiUJCPmlTU9MsGR1H/GJre0ds1uTkJEZG3nwzGo3HY+Pj4jSsNhu8/gD0w8OskCPk/rl5z1LpE7DE/wfTkjjGXWLJQRRpovhuZgYO5z4pP4iamhp1zhS6u7u572dniCcScHs8sFisWN+w4NMvWIi6QB4ku9LV1RXKIVB1dJjJX1iiDNm+TJjjRL+CqrAfRDlDFusqHDlAa2vrSg6B4KexsXGiqKjofnFx8WNSxalfbBYNyutNkvhDElfI5fIJ4W7ex5TFi4EBF0umwzAMmpubV/77NWZRUFAgI52eE0DON/Pd+wH6O+vw3ozilAAAAABJRU5ErkJggg==)}#pageMenu td .pageMenuArea>a.config:hover{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACiElEQVQ4y41Ta0iTYRQe/ShCTCpJiiRIKvtTiUE3+2VRiMR+JEk3ktKMslmGJZVEf1aZhpFFS/uRQ7Jcq2jVKvKCu2S66eZl05zu5qd9m+5i28TtO73njYXyNeiDw/dyOOc5z3me9xUAgOBfUXYgNUv3+JxH/0Q0lZ22MjNWHS/R9agwsfZU+hL5hZ0vAi4HhLwsKC5lSBuLtsepbx9MignQ/bRENCC7xekkRYyx4brf6zCB194Pv1gbhGeCMNAk9pEaZlgp4Tru5xXOA0hKWLSg59kVu8dqBJyK4R+3wJSlG3xOM/iZHxD0TEDI54LZ4DQYpFdHeAyK96+rxgb3YAdMDevBoZXDaHM9jH1/R3MBt5PGjH8SzmSmiHkAmru5Omz8aWyGwbf3KAijV0YIqwg2WT7XgW9siDJR38n59hdAcjI9S1NxiGX728M4ya5uAo+tF8i+1sT4hcLk5YuPDikesLgWskJdXCZNWFt1hM3ZtjpTcDxjTen0xAiwfW04EUZbpOA2a6Eka315dMrDE2kS0gTWtgaqC7JDcXN3JIsExOMinIjUGd1HCoCA7WLhpygAuQ9d6Ir5TRWM93yhABj7NiUVCMiXUHl4s4JYx6ALTNcHKlZf400w1Jd5Sd7X+/wGdcOueQWTQ52gry12YA/2zr15NWgTsiFeUxtxpQnDVzrNJK+gLPF8dm9KJc+FlvI9zGzAR++Aa0AFNtXLeYHTERxDeXm3kwfw+uIuFReJIABHBOJwZ9yXTv0jHEf+EczX5W9t5QHgPteEG2VrV8Tlpa6KP09YhKJiEVf8JH+a5AtKszfIsDbmY4pGZ02+mVImwlYf29L6369xDqNlROn3GOS8NFbdbzB85s9H8NGVAAAAAElFTkSuQmCC)}#updateAvailableContainer{float:right;border:1px dashed #ddd;background-color:#fff;font-size:.6em;line-height:1em;padding:4px 10px 4px 70px;text-align:right;height:64px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAABACAYAAACz4p94AAAVPUlEQVRo3s2aWaxk13Wev7X3PkONd+6+PQ+cmoNItkha4iCYtBVLpGQ7MkQ78EMICBZt+EFAAENMgAAKkAQInYcEQR6Sl8AKHE1OBBkg2YJFKS0O8iCSgimymyLZTXY3e+471q1bVWfYKw/7nLrVDCkDQQNhNQ7OrdNVe69/Tf9aa5dwLV+P/ycOuE1z8fxZKaa2U4pQYkEBY0m3tZk79pKePXbc8/ZPrtm27pqscvfn4aWnYO+exq5WvqCptUOXMHAJmYkZFYpzMfO7usysnSnOvnnqIpB9tEC89BQArW5zenpK7ugPB+nQRLRtQm4tK3lJZCKmui1ttFt9Ytf76IGoXs00WUib9oHp6dlOZoyU4siNxY9KrHV0Gw1Va5dw9nVg9SMJIo3jxTSJPjnXbc8UYqWwjhzDMCmxxtFsNXQTvUDkvguc/kiCEGsX4ii6ud3tTJXGUIhjKJbesERcRLedMvB+Gmu713LfawoC9Q1nbDrTdHFpHKWxbIil5RTjItrNhEtIijWNjyyIIi8iI0g3TSisozQOVUPTCDZKaDYjBBVEoo8siOFoJKinncTk1lLaiEwtqXNESUI3teABMeYjC2IwGIovSpqxIzeO0jr6RKQupptEbIs8AmBEP7og+hv4vCB2DmsdhYtwGtHEMR8J2xyIEhj8IxvYvR5lNsIaQYxBjMFhaakw42C23k2uLYhr6ptcPJ8x3FQjghXBVEASK7Ss0A67KSvr2TW1xF9897uRM/aPW63mnla7U7Zb7bC5UN0FEETkqmfhOUglrBHDn3z32cM220yCpDJWuAGsASuQRK79L77y2Jef+Mf/40EFUdlaQyb2kbAZBkFRijwnyzLyoiDPMrJwRXme/5UzmEjEfBkxtwqCMeHaEnTr76ufT2wuAqIcmmlxYZDhvWppVEpVCpQcyD1kHk0i17hp1/bfCZKCqdarARgRMBPPjCAalBeAMt5bVVHV0llr1BjJjAhxHBEnCda6qzRvEMSAiA2LimDEhA3HloDIOWBEXnopjacsPUP19MXQK6HnEUWI4pi02awiPAgKEnxbggWlAmOqTxljq2ASvCp5ntcgCmeMwVpLmjb43z/8AUl+kZgMjEHiGfCKiWJwCUWRUSKIsYhmCAXYFCmGiHpeO9OnffAuhmVJQYliGPmCnhiuGEvHwWiwyQ/+15+z9uPv4FUxrS6MelDm+NYUuBhrLNYlaL+HZhkap2AU1ZCieyPLdTffwaFDN6GqODGVyQRmZ2f4/V/7OKkbgFho7YM8g7QFaYdvP3+MYxeWKLLine truncated

Disco.Web/T4MVC.cs

@@ -4478,6 +4478,12 @@ namespace Disco.Web.Areas.API.Controllers
         }
         [NonAction]
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult UpdateAllowUntrustedReimageJobEnrolment()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateAllowUntrustedReimageJobEnrolment);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public virtual System.Web.Mvc.ActionResult Delete()
         {
             return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Delete);
@@ -4529,6 +4535,7 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string UpdateEnforceOrganisationalUnit = "UpdateEnforceOrganisationalUnit";
             public readonly string UpdateProvisionADAccount = "UpdateProvisionADAccount";
             public readonly string UpdateAssignedUserLocalAdmin = "UpdateAssignedUserLocalAdmin";
+            public readonly string UpdateAllowUntrustedReimageJobEnrolment = "UpdateAllowUntrustedReimageJobEnrolment";
             public readonly string OrganisationalUnits = "OrganisationalUnits";
             public readonly string Delete = "Delete";
             public readonly string Default = "Default";
@@ -4552,6 +4559,7 @@ namespace Disco.Web.Areas.API.Controllers
             public const string UpdateEnforceOrganisationalUnit = "UpdateEnforceOrganisationalUnit";
             public const string UpdateProvisionADAccount = "UpdateProvisionADAccount";
             public const string UpdateAssignedUserLocalAdmin = "UpdateAssignedUserLocalAdmin";
+            public const string UpdateAllowUntrustedReimageJobEnrolment = "UpdateAllowUntrustedReimageJobEnrolment";
             public const string OrganisationalUnits = "OrganisationalUnits";
             public const string Delete = "Delete";
             public const string Default = "Default";
@@ -4691,6 +4699,16 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string AssignedUserLocalAdmin = "AssignedUserLocalAdmin";
             public readonly string redirect = "redirect";
         }
+        static readonly ActionParamsClass_UpdateAllowUntrustedReimageJobEnrolment s_params_UpdateAllowUntrustedReimageJobEnrolment = new ActionParamsClass_UpdateAllowUntrustedReimageJobEnrolment();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_UpdateAllowUntrustedReimageJobEnrolment UpdateAllowUntrustedReimageJobEnrolmentParams { get { return s_params_UpdateAllowUntrustedReimageJobEnrolment; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_UpdateAllowUntrustedReimageJobEnrolment
+        {
+            public readonly string id = "id";
+            public readonly string AllowUntrustedReimageJobEnrolment = "AllowUntrustedReimageJobEnrolment";
+            public readonly string redirect = "redirect";
+        }
         static readonly ActionParamsClass_Delete s_params_Delete = new ActionParamsClass_Delete();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionParamsClass_Delete DeleteParams { get { return s_params_Delete; } }
@@ -4902,6 +4920,18 @@ namespace Disco.Web.Areas.API.Controllers
             return callInfo;
         }
 
+        partial void UpdateAllowUntrustedReimageJobEnrolmentOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string AllowUntrustedReimageJobEnrolment, bool? redirect);
+
+        public override System.Web.Mvc.ActionResult UpdateAllowUntrustedReimageJobEnrolment(int id, string AllowUntrustedReimageJobEnrolment, bool? redirect)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateAllowUntrustedReimageJobEnrolment);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "AllowUntrustedReimageJobEnrolment", AllowUntrustedReimageJobEnrolment);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
+            UpdateAllowUntrustedReimageJobEnrolmentOverride(callInfo, id, AllowUntrustedReimageJobEnrolment, redirect);
+            return callInfo;
+        }
+
         partial void OrganisationalUnitsOverride(T4MVC_System_Web_Mvc_ActionResult callInfo);
 
         public override System.Web.Mvc.ActionResult OrganisationalUnits()