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

Fix: Device Profile Creation

Browse Source 
Regression caused by b17ed91fb0
This commit is contained in:
Gary Sharp
2013-06-06 12:09:14 +10:00
parent 74146695e4
commit ed87b27708
9 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0603.2017")] [assembly: AssemblyVersion("1.2.0606.1156")]
[assembly: AssemblyFileVersion("1.2.0603.2017")] [assembly: AssemblyFileVersion("1.2.0606.1156")]
Disco.Data/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0603.2017")] [assembly: AssemblyVersion("1.2.0606.1156")]
[assembly: AssemblyFileVersion("1.2.0603.2017")] [assembly: AssemblyFileVersion("1.2.0606.1156")]
Disco.Models/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0603.2017")] [assembly: AssemblyVersion("1.2.0606.1156")]
[assembly: AssemblyFileVersion("1.2.0603.2017")] [assembly: AssemblyFileVersion("1.2.0606.1156")]
Disco.Services/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0603.2017")] [assembly: AssemblyVersion("1.2.0606.1156")]
[assembly: AssemblyFileVersion("1.2.0603.2017")] [assembly: AssemblyFileVersion("1.2.0606.1156")]
Disco.Web.Extensions/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0603.2017")] [assembly: AssemblyVersion("1.2.0606.1156")]
[assembly: AssemblyFileVersion("1.2.0603.2017")] [assembly: AssemblyFileVersion("1.2.0606.1156")]
Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
+9 -1
View File
@@ -10,6 +10,7 @@ using Disco.Services.Plugins.Features.CertificateProvider;
using Disco.Services.Plugins; using Disco.Services.Plugins;
using Disco.Services.Plugins.Features.UIExtension; using Disco.Services.Plugins.Features.UIExtension;
using Disco.Models.UI.Config.DeviceProfile; using Disco.Models.UI.Config.DeviceProfile;
using Disco.Models.Repository;
namespace Disco.Web.Areas.Config.Controllers namespace Disco.Web.Areas.Config.Controllers
{ {
@@ -65,7 +66,14 @@ namespace Disco.Web.Areas.Config.Controllers
public virtual ActionResult Create() public virtual ActionResult Create()
{ {
var m = new Models.DeviceProfile.CreateModel(); var m = new Models.DeviceProfile.CreateModel()
{
DeviceProfile = new DeviceProfile()
{
ComputerNameTemplate = "DeviceProfile.ShortName + '-' + SerialNumber",
ProvisionADAccount = true
}
};
// UI Extensions // UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(this.ControllerContext, m); UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(this.ControllerContext, m);
Disco.Web/Areas/Config/Views/DeviceProfile/Create.cshtml
+2 -2
View File
@@ -29,8 +29,8 @@
</td> </td>
</tr> </tr>
</table> </table>
<input type="hidden" name="ComputerNameTemplate" value="DeviceProfile.ShortName + '-' + SerialNumber" /> @Html.HiddenFor(model => model.DeviceProfile.ComputerNameTemplate)
<input type="hidden" name="ProvisionADAccount" value="True" /> @Html.HiddenFor(model => model.DeviceProfile.ProvisionADAccount)
<p class="actions"> <p class="actions">
<input type="submit" class="button" value="Create" /> <input type="submit" class="button" value="Create" />
</p> </p>
Disco.Web/Areas/Config/Views/DeviceProfile/Create.generated.cs
+18 -12
View File
@@ -31,7 +31,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
using Disco.Web; using Disco.Web;
using Disco.Web.Extensions; using Disco.Web.Extensions;
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Create.cshtml")] [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Create.cshtml")]
public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel> public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel>
{ {
@@ -124,23 +124,29 @@ WriteLiteral("<br />");
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n </td>\r\n </tr>\r\n </table>\r\n <input"); WriteLiteral("\r\n </td>\r\n </tr>\r\n </table>\r\n");
WriteLiteral(" type=\"hidden\""); WriteLiteral(" ");
WriteLiteral(" name=\"ComputerNameTemplate\"");
#line 32 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.HiddenFor(model => model.DeviceProfile.ComputerNameTemplate));
WriteLiteral(" value=\"DeviceProfile.ShortName + \'-\' + SerialNumber\"");
#line default
#line hidden
WriteLiteral("\r\n");
WriteLiteral(" />\r\n <input"); WriteLiteral(" ");
WriteLiteral(" type=\"hidden\"");
#line 33 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.HiddenFor(model => model.DeviceProfile.ProvisionADAccount));
WriteLiteral(" name=\"ProvisionADAccount\"");
#line default
WriteLiteral(" value=\"True\""); #line hidden
WriteLiteral("\r\n <p");
WriteLiteral(" />\r\n <p");
WriteLiteral(" class=\"actions\""); WriteLiteral(" class=\"actions\"");
Disco.Web/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.0603.2017")] [assembly: AssemblyVersion("1.2.0606.1156")]
[assembly: AssemblyFileVersion("1.2.0603.2017")] [assembly: AssemblyFileVersion("1.2.0606.1156")]