From e940c245227e9b30b8a01ad34c71ab9ba9d38601 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Tue, 2 Sep 2014 14:45:02 +1000 Subject: [PATCH] Bug Fix: Document template bulk examples --- .../Config/Views/DocumentTemplate/Show.cshtml | 71 ++--- .../Views/DocumentTemplate/Show.generated.cs | 243 ++++++++++++------ 2 files changed, 211 insertions(+), 103 deletions(-) diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml index a04210a2..a08fea8d 100644 --- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml +++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml @@ -682,15 +682,47 @@ Bulk Generate
-
- Enter multiple  separated by <new line>, commas (,) or semicolons (;). -
-
-

Examples:

-
-
-
-
+ @switch (Model.DocumentTemplate.Scope) + { + case "Device": +
+ Enter multiple Device Serial Numbers separated by <new line>, commas (,) or semicolons (;). +
+
+

Examples:

+
01234567
+ ABCD9876
+ 8VQ6G2R
+
01234567,ABCD9876,8VQ6G2R
+
01234567;ABCD9876;8VQ6G2R
+
+ break; + case "Job": +
+ Enter multiple Job Ids separated by <new line>, commas (,) or semicolons (;). +
+
+

Examples:

+
86
+ 99
+ 44
+
86,99,44
+
86;99;44
+
+ break; + case "User": +
+ Enter multiple User Ids separated by <new line>, commas (,) or semicolons (;). +
+
+

Examples:

+
user6
+ smi0099
@(ActiveDirectory.Context.PrimaryDomain.NetBiosName)\rsmith
+
user6,smi0099,@(ActiveDirectory.Context.PrimaryDomain.NetBiosName)\rsmith
+
user6;smi0099;@(ActiveDirectory.Context.PrimaryDomain.NetBiosName)\rsmith
+
+ break; + }
@using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post)) { @@ -724,27 +756,6 @@ $.validator.unobtrusive.reparse('#inputBulkGenerateDataIds'); } - switch ($('#DocumentTemplate_Scope').val()) { - case 'Device': - dialog.find('.scopeDescBulkGenerate').text('Device Serial Numbers'); - dialog.find('.example1').html('01234567
ABCD9876
8VQ6G2R'); - dialog.find('.example2').text('01234567,ABCD9876,8VQ6G2R'); - dialog.find('.example3').text('01234567;ABCD9876;8VQ6G2R'); - break; - case 'Job': - dialog.find('.scopeDescBulkGenerate').text('Job Ids'); - dialog.find('.example1').html('86
99
44'); - dialog.find('.example2').text('86,99,44'); - dialog.find('.example3').text('86;99;44'); - break; - case 'User': - dialog.find('.scopeDescBulkGenerate').text('User Ids'); - dialog.find('.example1').html('user6
smi0099
@(ActiveDirectory.Context.PrimaryDomain.NetBiosName)\\rsmith'); - dialog.find('.example2').text('user6,smi0099,@(ActiveDirectory.Context.PrimaryDomain.NetBiosName)\\rsmith'); - dialog.find('.example3').text('user6;smi0099;@(ActiveDirectory.Context.PrimaryDomain.NetBiosName)\\rsmith'); - break; - } - dialog.dialog('open'); return false; }); diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs index b6742db1..1381e1d3 100644 --- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs +++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs @@ -1975,37 +1975,161 @@ WriteLiteral(">\r\n \r\n
\r\n Enter multiple \r\n"); + + + #line 685 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + + + #line default + #line hidden + + #line 685 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + switch (Model.DocumentTemplate.Scope) + { + case "Device": + + + #line default + #line hidden +WriteLiteral("
\r\n Enter multiple  separated by <new line>, commas (,)" + -" or semicolons (;).\r\n
\r\n Device Serial Numbers separated by <new line>, commas " + +"(,) or semicolons (;).\r\n
\r\n"); + +WriteLiteral(" \r\n

Examples:

\r\n \r\n

Examples:

\r\n
\r\n 01234567
\r\n ABCD9876
\r\n " + +" 8VQ6G2R\r\n \r\n 01234567,ABCD9876,8VQ6G2R\r\n \r\n \r\n \r\n"); +WriteLiteral(">01234567;ABCD9876;8VQ6G2R\r\n \r\n"); - #line 695 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 699 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + break; + case "Job": + + + #line default + #line hidden +WriteLiteral("
\r\n Enter multiple Job Ids separated by <new line>, commas (,) or semicolons (;).\r\n
\r\n"); + +WriteLiteral(" \r\n

Examples:

\r\n 86
\r\n 99
\r\n 44\r\n 86,99,44\r\n 86;99;44\r\n \r\n"); + + + #line 712 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + break; + case "User": + + + #line default + #line hidden +WriteLiteral("
\r\n Enter multiple User Ids separated by <new line>, commas (,) or semicolons (;).\r\n
\r\n"); + +WriteLiteral(" \r\n

Examples:

\r\n user6
\r\n smi0099
"); + + + #line 720 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName); + + + #line default + #line hidden +WriteLiteral("\\rsmith\r\n user6,smi0099,"); + + + #line 721 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName); + + + #line default + #line hidden +WriteLiteral("\\rsmith\r\n user6;smi0099;"); + + + #line 722 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName); + + + #line default + #line hidden +WriteLiteral("\\rsmith\r\n \r\n"); + + + #line 724 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + break; + } + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 727 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 695 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 727 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" using (Html.BeginForm(MVC.API.DocumentTemplate.BulkGenerate(Model.DocumentTemplate.Id), FormMethod.Post)) { @@ -2035,7 +2159,7 @@ WriteLiteral(" data-val-required=\"Identifiers are required\""); WriteLiteral(">\r\n"); - #line 699 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 731 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } @@ -2044,73 +2168,46 @@ WriteLiteral(">\r\n"); WriteLiteral(" \r\n"); - #line 701 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 733 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden -WriteLiteral(" +"); - #line 742 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" - Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName); - - - #line default - #line hidden -WriteLiteral("\\\\rsmith\');\r\n dialog.find(\'.example2\').text(\'user6,smi" + -"0099,"); - - - #line 743 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" - Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName); - - - #line default - #line hidden -WriteLiteral("\\\\rsmith\');\r\n dialog.find(\'.example3\').text(\'user6;smi" + -"0099;"); - - - #line 744 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" - Write(ActiveDirectory.Context.PrimaryDomain.NetBiosName); - - - #line default - #line hidden -WriteLiteral("\\\\rsmith\');\r\n break;\r\n }\r\n\r\n " + -" dialog.dialog(\'open\');\r\n return false;\r\n " + -" });\r\n });\r\n \r\n"); - - - #line 753 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 764 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } @@ -2119,7 +2216,7 @@ WriteLiteral("\\\\rsmith\');\r\n break;\r\n WriteLiteral(" "); - #line 754 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 765 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (Authorization.Has(Claims.Config.DocumentTemplate.Delete)) { @@ -2127,14 +2224,14 @@ WriteLiteral(" "); #line default #line hidden - #line 756 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 767 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.ActionLinkButton("Delete", MVC.API.DocumentTemplate.Delete(Model.DocumentTemplate.Id, true), "buttonDelete")); #line default #line hidden - #line 756 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 767 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" }