diff --git a/Disco.Client/Extensions/EnrolExtensions.cs b/Disco.Client/Extensions/EnrolExtensions.cs index 8f7f96d0..af568e9f 100644 --- a/Disco.Client/Extensions/EnrolExtensions.cs +++ b/Disco.Client/Extensions/EnrolExtensions.cs @@ -134,7 +134,10 @@ namespace Disco.Client.Extensions if (enrolResponse.AssignedUserIsLocalAdmin) LocalAuthentication.AddLocalGroupMembership("Administrators", enrolResponse.AssignedUserSID, enrolResponse.AssignedUserUsername, enrolResponse.AssignedUserDomain); + } + if (enrolResponse.SetAssignedUserForLogon && !string.IsNullOrEmpty(enrolResponse.AssignedUserDomain) && !string.IsNullOrEmpty(enrolResponse.AssignedUserUsername)) + { // Make Windows think this user was the last to logon using (RegistryKey regWinlogon = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon", true)) { diff --git a/Disco.Data/Disco.Data.csproj b/Disco.Data/Disco.Data.csproj index b8aa9ca5..a0f8ccc1 100644 --- a/Disco.Data/Disco.Data.csproj +++ b/Disco.Data/Disco.Data.csproj @@ -201,6 +201,10 @@ 202507170522576_DBv28.cs + + + 202509070209304_DBv29.cs + @@ -300,6 +304,9 @@ 202507170522576_DBv28.cs + + 202509070209304_DBv29.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/Disco.Data/Migrations/202509070209304_DBv29.Designer.cs b/Disco.Data/Migrations/202509070209304_DBv29.Designer.cs new file mode 100644 index 00000000..7cb63e4b --- /dev/null +++ b/Disco.Data/Migrations/202509070209304_DBv29.Designer.cs @@ -0,0 +1,27 @@ +// +namespace Disco.Data.Migrations +{ + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + public sealed partial class DBv29 : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(DBv29)); + + string IMigrationMetadata.Id + { + get { return "202509070209304_DBv29"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/Disco.Data/Migrations/202509070209304_DBv29.cs b/Disco.Data/Migrations/202509070209304_DBv29.cs new file mode 100644 index 00000000..7cc607c2 --- /dev/null +++ b/Disco.Data/Migrations/202509070209304_DBv29.cs @@ -0,0 +1,18 @@ +namespace Disco.Data.Migrations +{ + using System.Data.Entity.Migrations; + + public partial class DBv29 : DbMigration + { + public override void Up() + { + AddColumn("dbo.DeviceProfiles", "SetAssignedUserForLogon", c => c.Boolean(nullable: false)); + Sql("UPDATE dbo.DeviceProfiles SET SetAssignedUserForLogon = 1"); + } + + public override void Down() + { + DropColumn("dbo.DeviceProfiles", "SetAssignedUserForLogon"); + } + } +} diff --git a/Disco.Data/Migrations/202509070209304_DBv29.resx b/Disco.Data/Migrations/202509070209304_DBv29.resx new file mode 100644 index 00000000..40b36efb --- /dev/null +++ b/Disco.Data/Migrations/202509070209304_DBv29.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + \ No newline at end of file diff --git a/Disco.Models/ClientServices/EnrolResponse.cs b/Disco.Models/ClientServices/EnrolResponse.cs index 393b3a7a..0407012a 100644 --- a/Disco.Models/ClientServices/EnrolResponse.cs +++ b/Disco.Models/ClientServices/EnrolResponse.cs @@ -22,6 +22,7 @@ namespace Disco.Models.ClientServices public string AssignedUserDescription { get; set; } public bool AssignedUserIsLocalAdmin { get; set; } + public bool SetAssignedUserForLogon { get; set; } public string OfflineDomainJoinManifest { get; set; } diff --git a/Disco.Models/Repository/Device/DeviceProfile.cs b/Disco.Models/Repository/Device/DeviceProfile.cs index 1e4c09e3..cc8d1bef 100644 --- a/Disco.Models/Repository/Device/DeviceProfile.cs +++ b/Disco.Models/Repository/Device/DeviceProfile.cs @@ -38,6 +38,7 @@ namespace Disco.Models.Repository public bool ProvisionADAccount { get; set; } public bool AssignedUserLocalAdmin { get; set; } + public bool SetAssignedUserForLogon { get; set; } public bool AllowUntrustedReimageJobEnrolment { get; set; } diff --git a/Disco.Services/Devices/Enrolment/WindowsDeviceEnrolment.cs b/Disco.Services/Devices/Enrolment/WindowsDeviceEnrolment.cs index 70187952..8127fdfc 100644 --- a/Disco.Services/Devices/Enrolment/WindowsDeviceEnrolment.cs +++ b/Disco.Services/Devices/Enrolment/WindowsDeviceEnrolment.cs @@ -501,6 +501,8 @@ namespace Disco.Services.Devices.Enrolment response.AllowBootstrapperUninstall = true; } + response.SetAssignedUserForLogon = device.DeviceProfile.SetAssignedUserForLogon; + // Provision Certificates if (!string.IsNullOrEmpty(device.DeviceProfile.CertificateProviders) || !string.IsNullOrEmpty(device.DeviceProfile.CertificateAuthorityProviders)) diff --git a/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs b/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs index 2481d268..116caaa3 100644 --- a/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs +++ b/Disco.Web/Areas/API/Controllers/DeviceProfileController.cs @@ -22,22 +22,23 @@ namespace Disco.Web.Areas.API.Controllers { public partial class DeviceProfileController : AuthorizedDatabaseController { - const string pDescription = "description"; - const string pName = "name"; - const string pShortName = "shortname"; - const string pDistributionType = "distributiontype"; - const string pCertificateProviders = "certificateproviders"; - const string pCertificateAuthorityProviders = "certificateauthorityproviders"; - const string pWirelessProfileProviders = "wirelessprofileproviders"; - const string pOrganisationalUnit = "organisationalunit"; - const string pDefaultOrganisationAddress = "defaultorganisationaddress"; - const string pEnforceComputerNameConvention = "enforcecomputernameconvention"; - const string pEnforceOrganisationalUnit = "enforceorganisationalunit"; - const string pProvisionADAccount = "provisionadaccount"; - const string pAssignedUserLocalAdmin = "assigneduserlocaladmin"; - const string pAllowUntrustedReimageJobEnrolment = "allowuntrustedreimagejobrnrolment"; - const string pDevicesLinkedGroup = "deviceslinkedgroup"; - const string pAssignedUsersLinkedGroup = "assigneduserslinkedgroup"; + private const string pDescription = "description"; + private const string pName = "name"; + private const string pShortName = "shortname"; + private const string pDistributionType = "distributiontype"; + private const string pCertificateProviders = "certificateproviders"; + private const string pCertificateAuthorityProviders = "certificateauthorityproviders"; + private const string pWirelessProfileProviders = "wirelessprofileproviders"; + private const string pOrganisationalUnit = "organisationalunit"; + private const string pDefaultOrganisationAddress = "defaultorganisationaddress"; + private const string pEnforceComputerNameConvention = "enforcecomputernameconvention"; + private const string pEnforceOrganisationalUnit = "enforceorganisationalunit"; + private const string pProvisionADAccount = "provisionadaccount"; + private const string pAssignedUserLocalAdmin = "assigneduserlocaladmin"; + private const string pSetAssignedUserForLogon = "setassigneduserforlogon"; + private const string pAllowUntrustedReimageJobEnrolment = "allowuntrustedreimagejobrnrolment"; + private const string pDevicesLinkedGroup = "deviceslinkedgroup"; + private const string pAssignedUsersLinkedGroup = "assigneduserslinkedgroup"; [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)] [HttpPost, ValidateAntiForgeryToken] @@ -95,6 +96,9 @@ namespace Disco.Web.Areas.API.Controllers case pAssignedUserLocalAdmin: UpdateAssignedUserLocalAdmin(deviceProfile, value); break; + case pSetAssignedUserForLogon: + UpdateSetAssignedUserForLogon(deviceProfile, value); + break; case pAllowUntrustedReimageJobEnrolment: UpdateAllowUntrustedReimageJobEnrolment(deviceProfile, value); break; @@ -347,6 +351,13 @@ namespace Disco.Web.Areas.API.Controllers return Update(id, pProvisionADAccount, ProvisionADAccount, redirect); } + [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)] + [HttpPost, ValidateAntiForgeryToken] + public virtual ActionResult UpdateSetAssignedUserForLogon(int id, string setAssignedUserForLogon = null, bool? redirect = null) + { + return Update(id, pSetAssignedUserForLogon, setAssignedUserForLogon, redirect); + } + [DiscoAuthorize(Claims.Config.DeviceProfile.Configure)] [HttpPost, ValidateAntiForgeryToken] public virtual ActionResult UpdateAssignedUserLocalAdmin(int id, string AssignedUserLocalAdmin = null, bool? redirect = null) @@ -667,6 +678,18 @@ namespace Disco.Web.Areas.API.Controllers throw new Exception("Invalid Boolean Value"); } + private void UpdateSetAssignedUserForLogon(DeviceProfile deviceProfile, string setAssignedUserForLogon) + { + if (bool.TryParse(setAssignedUserForLogon, out var bValue)) + { + deviceProfile.SetAssignedUserForLogon = bValue; + + Database.SaveChanges(); + return; + } + throw new Exception("Invalid Boolean Value"); + } + private void UpdateAllowUntrustedReimageJobEnrolment(DeviceProfile deviceProfile, string allowUntrustedReimageJobEnrolment) { if (bool.TryParse(allowUntrustedReimageJobEnrolment, out var bValue)) diff --git a/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs b/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs index a9490e1b..7469279e 100644 --- a/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs +++ b/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs @@ -134,7 +134,8 @@ namespace Disco.Web.Areas.Config.Controllers ProvisionADAccount = true, ComputerNameTemplate = DeviceProfile.DefaultComputerNameTemplate, DistributionType = DeviceProfile.DistributionTypes.OneToMany, - OrganisationalUnit = ActiveDirectory.Context.PrimaryDomain.DefaultComputerContainer + OrganisationalUnit = ActiveDirectory.Context.PrimaryDomain.DefaultComputerContainer, + SetAssignedUserForLogon = true, }; Database.DeviceProfiles.Add(deviceProfile); diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml index fc270384..c487aa27 100644 --- a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml +++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml @@ -258,6 +258,35 @@

+
+ @if (canConfig) + { + + + } + else + { + + } + + @AjaxHelpers.AjaxLoader() +
+

+ When enabled the assigned user details will be pre-populated at the device logon screen. +

+
+
@if (canConfig) { diff --git a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs index e88d1621..a893f5ef 100644 --- a/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs +++ b/Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs @@ -1011,7 +1011,7 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral("
\r\n " + +" \r\n \r\n"); + + + #line 291 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + + + #line default + #line hidden + + #line 291 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + if (canConfig) + { + + + #line default + #line hidden +WriteLiteral(" '"); - #line 270 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 299 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.DeviceProfile.UpdateAllowUntrustedReimageJobEnrolment(Model.DeviceProfile.Id))); @@ -1049,7 +1170,7 @@ WriteLiteral("\',\r\n \'AllowUntrustedReimage " \r\n"); - #line 275 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 304 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -1066,7 +1187,7 @@ WriteLiteral(" type=\"checkbox\""); WriteLiteral(" "); - #line 278 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 307 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.AllowUntrustedReimageJobEnrolment ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)); @@ -1075,7 +1196,7 @@ WriteLiteral(" "); WriteLiteral(" disabled=\"disabled\" />\r\n"); - #line 279 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 308 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1094,7 +1215,7 @@ WriteLiteral(">\'Software - Reimage\' Job is Open\r\n WriteLiteral(" "); - #line 283 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 312 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); @@ -1133,13 +1254,13 @@ WriteLiteral(" class=\"code\""); WriteLiteral(">\r\n"); - #line 299 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 328 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 299 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 328 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (string.IsNullOrWhiteSpace(Model.DeviceProfile.ComputerNameTemplate)) { @@ -1153,7 +1274,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Specified>\r\n"); - #line 302 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 331 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -1162,14 +1283,14 @@ WriteLiteral("><None Specified>\r\n"); #line default #line hidden - #line 305 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 334 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.ComputerNameTemplate); #line default #line hidden - #line 305 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 334 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1179,13 +1300,13 @@ WriteLiteral("><None Specified>\r\n"); WriteLiteral(" \r\n"); - #line 308 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 337 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 308 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 337 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && canConfigExpression) { @@ -1203,20 +1324,20 @@ WriteLiteral(" class=\"button small\""); WriteLiteral(">Change"); - #line 310 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 339 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 310 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 339 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 310 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 339 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" @@ -1233,13 +1354,13 @@ WriteLiteral(" class=\"dialog\""); WriteLiteral(">\r\n"); - #line 312 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 341 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 312 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 341 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" using (Html.BeginForm(MVC.API.DeviceProfile.UpdateComputerNameTemplate(Model.DeviceProfile.Id, null, false))) { @@ -1247,28 +1368,28 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 314 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 343 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 314 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 343 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 315 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 344 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.TextArea("ComputerNameTemplate", Model.DeviceProfile.ComputerNameTemplate, new { spellcheck = "false", required = "required" })); #line default #line hidden - #line 315 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 344 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1286,13 +1407,13 @@ WriteLiteral(" class=\"test hidden\""); WriteLiteral(">\r\n"); - #line 320 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 349 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 320 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 349 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" using (Html.BeginForm(MVC.API.DeviceProfile.TestComputerNameTemplate(Model.DeviceProfile.Id))) { @@ -1300,14 +1421,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 322 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 351 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 322 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 351 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" ; @@ -1350,7 +1471,7 @@ WriteLiteral(@" /> "); - #line 341 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 370 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1367,7 +1488,7 @@ WriteLiteral(" type=\"button\""); WriteLiteral(">Test Template"); - #line 343 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 372 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); @@ -1408,7 +1529,7 @@ WriteLiteral(@"> window.open('"); - #line 371 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 400 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.Config.Expressions.Browser())); @@ -1539,7 +1660,7 @@ WriteLiteral("\', \'_blank\');\r\n }, "{\r\n source: \'"); - #line 495 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 524 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.Search.Devices())); @@ -1572,7 +1693,7 @@ WriteLiteral(@"', "); - #line 519 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 548 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1585,13 +1706,13 @@ WriteLiteral(" style=\"margin-top: 8px;\""); WriteLiteral(">\r\n"); - #line 521 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 550 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 521 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 550 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig) { @@ -1607,7 +1728,7 @@ WriteLiteral(" type=\"checkbox\""); WriteLiteral(" "); - #line 523 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 552 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)); @@ -1627,7 +1748,7 @@ WriteLiteral(@"> '"); - #line 529 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 558 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceComputerNameConvention(Model.DeviceProfile.Id))); @@ -1638,7 +1759,7 @@ WriteLiteral("\',\r\n \'EnforceComputerNameCo " \r\n"); - #line 534 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 563 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -1655,7 +1776,7 @@ WriteLiteral(" type=\"checkbox\""); WriteLiteral(" "); - #line 537 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 566 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.EnforceComputerNameConvention ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)); @@ -1664,7 +1785,7 @@ WriteLiteral(" "); WriteLiteral(" disabled=\"disabled\" />\r\n"); - #line 538 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 567 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1680,7 +1801,7 @@ WriteLiteral(">\r\n Enforce Naming Convention\r\n WriteLiteral(" "); - #line 542 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 571 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); @@ -1712,13 +1833,13 @@ WriteLiteral(@">Computer names are only changed when Active Directory accoun "); - #line 557 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 586 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 557 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 586 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig) { @@ -1734,7 +1855,7 @@ WriteLiteral(" class=\"code\""); WriteLiteral(" data-value=\""); - #line 559 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 588 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.OrganisationalUnit); @@ -1747,7 +1868,7 @@ WriteLiteral(">\r\n \r\n"); WriteLiteral(" "); - #line 561 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 590 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.FriendlyOrganisationalUnitName); @@ -1766,20 +1887,20 @@ WriteLiteral(" class=\"button small\""); WriteLiteral(">Change"); - #line 564 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 593 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 564 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 593 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 564 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 593 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" @@ -1796,7 +1917,7 @@ WriteLiteral(" class=\"dialog\""); WriteLiteral(" data-url=\""); - #line 565 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 594 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.System.DomainOrganisationalUnits())); @@ -1813,7 +1934,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 567 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 596 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); @@ -1829,13 +1950,13 @@ WriteLiteral(" class=\"organisationalUnitTree\""); WriteLiteral(">\r\n \r\n"); - #line 571 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 600 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 571 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 600 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" using (Html.BeginForm(MVC.API.DeviceProfile.UpdateOrganisationalUnit(Model.DeviceProfile.Id, redirect: true))) { @@ -1843,14 +1964,14 @@ WriteLiteral(">\r\n \r\n"); #line default #line hidden - #line 573 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 602 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 573 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 602 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" ; @@ -1886,7 +2007,7 @@ WriteLiteral(">Move all profile devices to this organisational unit\r\n " \r\n"); - #line 578 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 607 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -1982,7 +2103,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 694 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 723 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -2001,7 +2122,7 @@ WriteLiteral(">\r\n \r\n"); WriteLiteral(" "); - #line 699 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 728 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.FriendlyOrganisationalUnitName); @@ -2010,7 +2131,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n \r\n"); - #line 702 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 731 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2019,7 +2140,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 703 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 732 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (!Model.OrganisationalUnitExists) { @@ -2042,7 +2163,7 @@ WriteLiteral(">The Organisational Unit could not be found.\r\n " \r\n"); - #line 710 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 739 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2055,13 +2176,13 @@ WriteLiteral(" style=\"margin-top: 8px;\""); WriteLiteral(">\r\n"); - #line 712 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 741 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 712 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 741 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig) { @@ -2077,7 +2198,7 @@ WriteLiteral(" type=\"checkbox\""); WriteLiteral(" "); - #line 714 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 743 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)); @@ -2097,7 +2218,7 @@ WriteLiteral(@"> '"); - #line 720 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 749 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.DeviceProfile.UpdateEnforceOrganisationalUnit(Model.DeviceProfile.Id))); @@ -2108,7 +2229,7 @@ WriteLiteral("\',\r\n \'EnforceOrganisational " \r\n"); - #line 725 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 754 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -2125,7 +2246,7 @@ WriteLiteral(" type=\"checkbox\""); WriteLiteral(" "); - #line 728 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 757 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Model.DeviceProfile.EnforceOrganisationalUnit ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)); @@ -2134,7 +2255,7 @@ WriteLiteral(" "); WriteLiteral(" disabled=\"disabled\" />\r\n"); - #line 729 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 758 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2150,7 +2271,7 @@ WriteLiteral(">\r\n Enforce Organisational Unit\r\n WriteLiteral(" "); - #line 733 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 762 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); @@ -2181,13 +2302,13 @@ WriteLiteral(@">When an Active Directory account is provisioned it will be p "); - #line 747 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 776 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 747 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 776 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && (Model.CertificateProviders.Count > 0 || Model.CertificateAuthorityProviders.Count > 0)) { @@ -2197,20 +2318,20 @@ WriteLiteral(@">When an Active Directory account is provisioned it will be p WriteLiteral("
\r\n"); - #line 750 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 779 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 750 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 779 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader("DeviceProfile_CertificateProviders")); #line default #line hidden - #line 750 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 779 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2220,7 +2341,7 @@ WriteLiteral("
\r\n"); WriteLiteral(" "); - #line 752 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 781 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && Model.CertificateProviders.Count > 0) { @@ -2245,7 +2366,7 @@ WriteLiteral(@"> fetch('"); - #line 765 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 794 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.DeviceProfile.UpdateCertificateProviders(Model.DeviceProfile.Id))); @@ -2271,7 +2392,7 @@ WriteLiteral(@"', { "); - #line 782 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 811 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2280,7 +2401,7 @@ WriteLiteral(@"', { WriteLiteral(" "); - #line 783 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 812 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && Model.CertificateProviders.Count > 0) { @@ -2305,7 +2426,7 @@ WriteLiteral(@"> fetch('"); - #line 796 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 825 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.DeviceProfile.UpdateCertificateAuthorityProviders(Model.DeviceProfile.Id))); @@ -2331,7 +2452,7 @@ WriteLiteral(@"', { "); - #line 813 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 842 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2341,13 +2462,13 @@ WriteLiteral(" \r\n \r\n

Devic "tes

\r\n"); - #line 817 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 846 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 817 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 846 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && Model.CertificateProviders.Count > 0) { @@ -2355,14 +2476,14 @@ WriteLiteral(" \r\n \r\n

Devic #line default #line hidden - #line 819 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 848 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(CommonHelpers.CheckBoxList("DeviceProfile_CertificateProviders", "DeviceProfile_CertificateProviders", Model.CertificateProviders.ToSelectListItems(Model.DeviceProfile.GetCertificateProviders()))); #line default #line hidden - #line 819 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 848 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else @@ -2382,7 +2503,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Allocated>\r\n"); - #line 828 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 857 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -2393,13 +2514,13 @@ WriteLiteral("><None Allocated>\r\n"); WriteLiteral("
    \r\n"); - #line 832 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 861 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 832 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 861 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" foreach (var certificateProvider in certificateProviders) { @@ -2409,7 +2530,7 @@ WriteLiteral("
      \r\n"); WriteLiteral("
    • "); - #line 834 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 863 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(certificateProvider.Name); @@ -2418,7 +2539,7 @@ WriteLiteral("
    • "); WriteLiteral("
      • \r\n"); - #line 835 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 864 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2427,7 +2548,7 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n"); - #line 837 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 866 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } } @@ -2441,13 +2562,13 @@ WriteLiteral(" style=\"margin-top: 4px;\""); WriteLiteral(">Authority Certificates

\r\n"); - #line 840 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 869 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 840 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 869 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && Model.CertificateAuthorityProviders.Count > 0) { @@ -2455,14 +2576,14 @@ WriteLiteral(">Authority Certificates\r\n"); #line default #line hidden - #line 842 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 871 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(CommonHelpers.CheckBoxList("DeviceProfile_CertificateAuthorityProviders", "DeviceProfile_CertificateAuthorityProviders", Model.CertificateAuthorityProviders.ToSelectListItems(Model.DeviceProfile.GetCertificateAuthorityProviders()))); #line default #line hidden - #line 842 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 871 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else @@ -2482,7 +2603,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Allocated>\r\n"); - #line 851 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 880 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -2493,13 +2614,13 @@ WriteLiteral("><None Allocated>\r\n"); WriteLiteral("
    \r\n"); - #line 855 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 884 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 855 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 884 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" foreach (var certificateProvider in certificateProviders) { @@ -2509,7 +2630,7 @@ WriteLiteral("
      \r\n"); WriteLiteral("
    • "); - #line 857 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 886 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(certificateProvider.Name); @@ -2518,7 +2639,7 @@ WriteLiteral("
    • "); WriteLiteral("
      • \r\n"); - #line 858 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 887 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2527,7 +2648,7 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n"); - #line 860 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 889 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } } @@ -2537,7 +2658,7 @@ WriteLiteral("
\r\n"); WriteLiteral(" "); - #line 862 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 891 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canViewPlugins) { @@ -2558,21 +2679,21 @@ WriteLiteral(" class=\"fa fa-info-circle\""); WriteLiteral(">View the (Url.Action(MVC.Config.Plugins.Install()) + #line 895 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" +, Tuple.Create(Tuple.Create("", 51454), Tuple.Create(Url.Action(MVC.Config.Plugins.Install()) #line default #line hidden -, 49701), false) +, 51454), false) ); WriteLiteral(">Plugin Catalogue to discover and install certificate provider plugins.\r\n " + "

\r\n \r\n"); - #line 869 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 898 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2582,13 +2703,13 @@ WriteLiteral(" \r\n \r\n \r\n " Provision Wireless Profiles:\r\n"); - #line 875 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 904 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 875 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 904 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && Model.WirelessProfileProviders.Count > 0) { @@ -2598,20 +2719,20 @@ WriteLiteral(" \r\n \r\n \r\n WriteLiteral("
\r\n"); - #line 878 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 907 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 878 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 907 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(AjaxHelpers.AjaxLoader("DeviceProfile_WirelessProfileProviders")); #line default #line hidden - #line 878 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 907 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" @@ -2635,7 +2756,7 @@ WriteLiteral(@"> fetch('"); - #line 890 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 919 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Url.Action(MVC.API.DeviceProfile.UpdateWirelessProfileProviders(Model.DeviceProfile.Id))); @@ -2661,7 +2782,7 @@ WriteLiteral(@"', { "); - #line 907 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 936 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2670,13 +2791,13 @@ WriteLiteral(@"', { WriteLiteral(" \r\n \r\n"); - #line 910 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 939 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 910 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 939 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig && Model.WirelessProfileProviders.Count > 0) { @@ -2684,14 +2805,14 @@ WriteLiteral(" \r\n \r\n"); #line default #line hidden - #line 912 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 941 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(CommonHelpers.CheckBoxList("DeviceProfile_WirelessProfileProviders", "DeviceProfile_WirelessProfileProviders", Model.WirelessProfileProviders.ToSelectListItems(Model.DeviceProfile.GetWirelessProfileProviders()))); #line default #line hidden - #line 912 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 941 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else @@ -2711,7 +2832,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Allocated>\r\n"); - #line 921 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 950 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } else { @@ -2722,13 +2843,13 @@ WriteLiteral("><None Allocated>\r\n"); WriteLiteral("
    \r\n"); - #line 925 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 954 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 925 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 954 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" foreach (var wirelessProfileProvider in wirelessProfileProviders) { @@ -2738,7 +2859,7 @@ WriteLiteral("
      \r\n"); WriteLiteral("
    • "); - #line 927 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 956 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(wirelessProfileProvider.Name); @@ -2747,7 +2868,7 @@ WriteLiteral("
    • "); WriteLiteral("
      • \r\n"); - #line 928 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 957 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2756,7 +2877,7 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n"); - #line 930 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 959 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } } @@ -2766,7 +2887,7 @@ WriteLiteral("
\r\n"); WriteLiteral(" "); - #line 932 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 961 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canViewPlugins) { @@ -2787,21 +2908,21 @@ WriteLiteral(" class=\"fa fa-info-circle\""); WriteLiteral(">View the (Url.Action(MVC.Config.Plugins.Install()) + #line 965 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" +, Tuple.Create(Tuple.Create("", 55112), Tuple.Create(Url.Action(MVC.Config.Plugins.Install()) #line default #line hidden -, 53359), false) +, 55112), false) ); WriteLiteral(">Plugin Catalogue to discover and install wireless profile provider plugins.\r" + "\n

\r\n \r\n"); - #line 939 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 968 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2810,13 +2931,13 @@ WriteLiteral(">Plugin Catalogue to discover and install wireless profile pro WriteLiteral(" \r\n \r\n"); - #line 942 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 971 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 942 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 971 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (hideAdvanced) { @@ -2850,7 +2971,7 @@ WriteLiteral(@">Show Advanced Options "); - #line 958 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 987 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2866,7 +2987,7 @@ WriteLiteral(">\r\n \r\n Linked Groups:\r\n WriteLiteral(" "); - #line 965 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 994 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views.LinkedGroupInstance, new LinkedGroupModel() { CanConfigure = canConfig, @@ -2884,7 +3005,7 @@ WriteLiteral("\r\n"); WriteLiteral(" "); - #line 973 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1002 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views.LinkedGroupInstance, new LinkedGroupModel() { CanConfigure = canConfig, @@ -2900,13 +3021,13 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 981 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1010 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 981 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1010 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canConfig) { @@ -2914,14 +3035,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 983 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1012 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views.LinkedGroupShared)); #line default #line hidden - #line 983 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1012 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -2931,7 +3052,7 @@ WriteLiteral("\r\n"); WriteLiteral(" \r\n \r\n \r\n \r\n\r\n"); - #line 990 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1019 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views._DeviceGroupDocumentBulkGenerate, Model)); @@ -2944,13 +3065,13 @@ WriteLiteral(" class=\"actionBar\""); WriteLiteral(">\r\n"); - #line 992 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1021 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 992 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1021 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (Model.CanDecommission) { @@ -2976,13 +3097,13 @@ WriteLiteral(" title=\"Profile Device Decommission\""); WriteLiteral(">\r\n"); - #line 996 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1025 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 996 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1025 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" using (Html.BeginForm(MVC.API.Device.DeviceProfileDecommission(Model.DeviceProfile.Id))) { @@ -2990,14 +3111,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 998 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1027 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 998 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1027 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" @@ -3022,13 +3143,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 1004 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1033 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 1004 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1033 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)).Cast().OrderBy(r => r.ToString())) { @@ -3039,33 +3160,33 @@ WriteLiteral("
  • \r\n WriteLiteral(" type=\"radio\""); -WriteAttribute("id", Tuple.Create(" id=\"", 57054), Tuple.Create("\"", 57126) -, Tuple.Create(Tuple.Create("", 57059), Tuple.Create("DeviceProfile_Decommission_Dialog_Reason_", 57059), true) +WriteAttribute("id", Tuple.Create(" id=\"", 58807), Tuple.Create("\"", 58879) +, Tuple.Create(Tuple.Create("", 58812), Tuple.Create("DeviceProfile_Decommission_Dialog_Reason_", 58812), true) - #line 1007 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" - , Tuple.Create(Tuple.Create("", 57100), Tuple.Create((int)decommissionReason + #line 1036 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + , Tuple.Create(Tuple.Create("", 58853), Tuple.Create((int)decommissionReason #line default #line hidden -, 57100), false) +, 58853), false) ); WriteLiteral("\r\n name=\"decommissionReason\""); -WriteAttribute("value", Tuple.Create(" value=\"", 57193), Tuple.Create("\"", 57227) +WriteAttribute("value", Tuple.Create(" value=\"", 58946), Tuple.Create("\"", 58980) - #line 1008 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" -, Tuple.Create(Tuple.Create("", 57201), Tuple.Create((int)decommissionReason + #line 1037 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" +, Tuple.Create(Tuple.Create("", 58954), Tuple.Create((int)decommissionReason #line default #line hidden -, 57201), false) +, 58954), false) ); WriteLiteral(" "); - #line 1008 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1037 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write((decommissionReason == DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty); @@ -3073,21 +3194,21 @@ WriteLiteral(" "); #line hidden WriteLiteral(" />\r\n ((int)decommissionReason + #line 1038 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + , Tuple.Create(Tuple.Create("", 59167), Tuple.Create((int)decommissionReason #line default #line hidden -, 57414), false) +, 59167), false) ); WriteLiteral(">"); - #line 1009 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1038 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(decommissionReason.ReasonMessage()); @@ -3096,7 +3217,7 @@ WriteLiteral(">"); WriteLiteral("\r\n
    • \r\n"); - #line 1011 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1040 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -3115,7 +3236,7 @@ WriteLiteral(" />\r\n Unassign devices users\r\n "\r\n \r\n"); - #line 1019 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1048 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -3159,7 +3280,7 @@ WriteLiteral(@"> "); - #line 1050 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1079 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -3168,7 +3289,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 1051 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1080 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (canDelete) { @@ -3196,13 +3317,13 @@ WriteLiteral(" title=\"Delete this Device Profile?\""); WriteLiteral(">\r\n"); - #line 1055 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1084 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" #line default #line hidden - #line 1055 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1084 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" using (Html.BeginForm(MVC.API.DeviceProfile.Delete(Model.DeviceProfile.Id, true))) { @@ -3210,14 +3331,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 1057 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1086 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 1057 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1086 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -3265,7 +3386,7 @@ WriteLiteral(@"> "); - #line 1091 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1120 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -3274,7 +3395,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 1092 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1121 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (Authorization.Has(Claims.Device.Actions.Export)) { @@ -3282,14 +3403,14 @@ WriteLiteral(" "); #line default #line hidden - #line 1094 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1123 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.ActionLinkButton("Export Devices", MVC.Device.Export(null, Disco.Models.Services.Devices.DeviceExportTypes.Profile, Model.DeviceProfile.Id))); #line default #line hidden - #line 1094 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1123 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } @@ -3299,7 +3420,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 1096 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1125 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" if (Authorization.Has(Claims.Device.Search) && Model.DeviceCount > 0) { @@ -3307,14 +3428,14 @@ WriteLiteral(" "); #line default #line hidden - #line 1098 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1127 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" Write(Html.ActionLinkButton(string.Format("View {0} Device{1}", Model.DeviceCount, (Model.DeviceCount != 1 ? "s" : null)), MVC.Search.Query(Model.DeviceProfile.Id.ToString(), "DeviceProfile"))); #line default #line hidden - #line 1098 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" + #line 1127 "..\..\Areas\Config\Views\DeviceProfile\Show.cshtml" } diff --git a/Disco.Web/Extensions/T4MVC/API.DeviceProfileController.generated.cs b/Disco.Web/Extensions/T4MVC/API.DeviceProfileController.generated.cs index 8547933e..b75528e8 100644 --- a/Disco.Web/Extensions/T4MVC/API.DeviceProfileController.generated.cs +++ b/Disco.Web/Extensions/T4MVC/API.DeviceProfileController.generated.cs @@ -151,6 +151,12 @@ namespace Disco.Web.Areas.API.Controllers } [NonAction] [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode] + public virtual System.Web.Mvc.ActionResult UpdateSetAssignedUserForLogon() + { + return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateSetAssignedUserForLogon); + } + [NonAction] + [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode] public virtual System.Web.Mvc.ActionResult UpdateAssignedUserLocalAdmin() { return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateAssignedUserLocalAdmin); @@ -222,6 +228,7 @@ namespace Disco.Web.Areas.API.Controllers public readonly string UpdateEnforceComputerNameConvention = "UpdateEnforceComputerNameConvention"; public readonly string UpdateEnforceOrganisationalUnit = "UpdateEnforceOrganisationalUnit"; public readonly string UpdateProvisionADAccount = "UpdateProvisionADAccount"; + public readonly string UpdateSetAssignedUserForLogon = "UpdateSetAssignedUserForLogon"; public readonly string UpdateAssignedUserLocalAdmin = "UpdateAssignedUserLocalAdmin"; public readonly string UpdateAllowUntrustedReimageJobEnrolment = "UpdateAllowUntrustedReimageJobEnrolment"; public readonly string UpdateDevicesLinkedGroup = "UpdateDevicesLinkedGroup"; @@ -249,6 +256,7 @@ namespace Disco.Web.Areas.API.Controllers public const string UpdateEnforceComputerNameConvention = "UpdateEnforceComputerNameConvention"; public const string UpdateEnforceOrganisationalUnit = "UpdateEnforceOrganisationalUnit"; public const string UpdateProvisionADAccount = "UpdateProvisionADAccount"; + public const string UpdateSetAssignedUserForLogon = "UpdateSetAssignedUserForLogon"; public const string UpdateAssignedUserLocalAdmin = "UpdateAssignedUserLocalAdmin"; public const string UpdateAllowUntrustedReimageJobEnrolment = "UpdateAllowUntrustedReimageJobEnrolment"; public const string UpdateDevicesLinkedGroup = "UpdateDevicesLinkedGroup"; @@ -411,6 +419,16 @@ namespace Disco.Web.Areas.API.Controllers public readonly string ProvisionADAccount = "ProvisionADAccount"; public readonly string redirect = "redirect"; } + static readonly ActionParamsClass_UpdateSetAssignedUserForLogon s_params_UpdateSetAssignedUserForLogon = new ActionParamsClass_UpdateSetAssignedUserForLogon(); + [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode] + public ActionParamsClass_UpdateSetAssignedUserForLogon UpdateSetAssignedUserForLogonParams { get { return s_params_UpdateSetAssignedUserForLogon; } } + [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode] + public class ActionParamsClass_UpdateSetAssignedUserForLogon + { + public readonly string id = "id"; + public readonly string setAssignedUserForLogon = "setAssignedUserForLogon"; + public readonly string redirect = "redirect"; + } static readonly ActionParamsClass_UpdateAssignedUserLocalAdmin s_params_UpdateAssignedUserLocalAdmin = new ActionParamsClass_UpdateAssignedUserLocalAdmin(); [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode] public ActionParamsClass_UpdateAssignedUserLocalAdmin UpdateAssignedUserLocalAdminParams { get { return s_params_UpdateAssignedUserLocalAdmin; } } @@ -709,6 +727,20 @@ namespace Disco.Web.Areas.API.Controllers return callInfo; } + [NonAction] + partial void UpdateSetAssignedUserForLogonOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string setAssignedUserForLogon, bool? redirect); + + [NonAction] + public override System.Web.Mvc.ActionResult UpdateSetAssignedUserForLogon(int id, string setAssignedUserForLogon, bool? redirect) + { + var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateSetAssignedUserForLogon); + ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id); + ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "setAssignedUserForLogon", setAssignedUserForLogon); + ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect); + UpdateSetAssignedUserForLogonOverride(callInfo, id, setAssignedUserForLogon, redirect); + return callInfo; + } + [NonAction] partial void UpdateAssignedUserLocalAdminOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string AssignedUserLocalAdmin, bool? redirect);