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

bug: whitespace missing in device/user flag tooltips

Browse Source
This commit is contained in:
Gary Sharp
2025-12-10 14:38:58 +11:00
parent 9e0d832aa1
commit f975c55b8a
14 changed files with 720 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+3 -2
View File
@@ -248,8 +248,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
+241 -235
View File
File diff suppressed because it is too large Load Diff
Disco.Web/Views/Device/Show.cshtml
+3 -2
View File
@@ -28,8 +28,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw fa-lg d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw fa-lg d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/Device/Show.generated.cs
+36 -30
View File
@@ -192,12 +192,17 @@ WriteLiteral(">");
#line default #line default
#line hidden #line hidden
WriteLiteral("</span>"); WriteLiteral("</span>\r\n");
#line 31 "..\..\Views\Device\Show.cshtml" #line 32 "..\..\Views\Device\Show.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
#line 32 "..\..\Views\Device\Show.cshtml"
if (flag.Item1.Comments != null) {
#line default #line default
#line hidden #line hidden
@@ -220,6 +225,7 @@ WriteLiteral("</span>");
#line 32 "..\..\Views\Device\Show.cshtml" #line 32 "..\..\Views\Device\Show.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span"); WriteLiteral(" <span");
@@ -229,7 +235,7 @@ WriteLiteral(" class=\"added\"");
WriteLiteral(">"); WriteLiteral(">");
#line 32 "..\..\Views\Device\Show.cshtml" #line 33 "..\..\Views\Device\Show.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)); Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
@@ -238,7 +244,7 @@ WriteLiteral(">");
WriteLiteral("</span>\r\n </span>\r\n </i>\r\n"); WriteLiteral("</span>\r\n </span>\r\n </i>\r\n");
#line 35 "..\..\Views\Device\Show.cshtml" #line 36 "..\..\Views\Device\Show.cshtml"
} }
} }
@@ -285,7 +291,7 @@ WriteLiteral(@">
"); ");
#line 69 "..\..\Views\Device\Show.cshtml" #line 70 "..\..\Views\Device\Show.cshtml"
} }
@@ -294,7 +300,7 @@ WriteLiteral(@">
WriteLiteral(" "); WriteLiteral(" ");
#line 70 "..\..\Views\Device\Show.cshtml" #line 71 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model));
@@ -335,13 +341,13 @@ WriteLiteral(" id=\"DeviceDetailTabItems\"");
WriteLiteral("></ul>\r\n"); WriteLiteral("></ul>\r\n");
#line 106 "..\..\Views\Device\Show.cshtml" #line 107 "..\..\Views\Device\Show.cshtml"
#line default #line default
#line hidden #line hidden
#line 106 "..\..\Views\Device\Show.cshtml" #line 107 "..\..\Views\Device\Show.cshtml"
if (Authorization.HasAny(Claims.Device.ShowComments, Claims.Device.ShowJobs)) if (Authorization.HasAny(Claims.Device.ShowComments, Claims.Device.ShowJobs))
{ {
@@ -349,14 +355,14 @@ WriteLiteral("></ul>\r\n");
#line default #line default
#line hidden #line hidden
#line 108 "..\..\Views\Device\Show.cshtml" #line 109 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._CommentsAndJobs, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._CommentsAndJobs, Model));
#line default #line default
#line hidden #line hidden
#line 108 "..\..\Views\Device\Show.cshtml" #line 109 "..\..\Views\Device\Show.cshtml"
} }
@@ -366,7 +372,7 @@ WriteLiteral("></ul>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 110 "..\..\Views\Device\Show.cshtml" #line 111 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowDetails)) if (Authorization.Has(Claims.Device.ShowDetails))
{ {
@@ -374,14 +380,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 112 "..\..\Views\Device\Show.cshtml" #line 113 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model));
#line default #line default
#line hidden #line hidden
#line 112 "..\..\Views\Device\Show.cshtml" #line 113 "..\..\Views\Device\Show.cshtml"
} }
@@ -391,7 +397,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 114 "..\..\Views\Device\Show.cshtml" #line 115 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAssignmentHistory)) if (Authorization.Has(Claims.Device.ShowAssignmentHistory))
{ {
@@ -399,14 +405,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 116 "..\..\Views\Device\Show.cshtml" #line 117 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model));
#line default #line default
#line hidden #line hidden
#line 116 "..\..\Views\Device\Show.cshtml" #line 117 "..\..\Views\Device\Show.cshtml"
} }
@@ -416,7 +422,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 118 "..\..\Views\Device\Show.cshtml" #line 119 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAttachments)) if (Authorization.Has(Claims.Device.ShowAttachments))
{ {
@@ -424,14 +430,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 120 "..\..\Views\Device\Show.cshtml" #line 121 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model));
#line default #line default
#line hidden #line hidden
#line 120 "..\..\Views\Device\Show.cshtml" #line 121 "..\..\Views\Device\Show.cshtml"
} }
@@ -441,7 +447,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 122 "..\..\Views\Device\Show.cshtml" #line 123 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowFlagAssignments) || Model.Device.DeviceFlagAssignments.CanShowAny()) if (Authorization.Has(Claims.Device.ShowFlagAssignments) || Model.Device.DeviceFlagAssignments.CanShowAny())
{ {
@@ -449,14 +455,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 124 "..\..\Views\Device\Show.cshtml" #line 125 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Flags, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Flags, Model));
#line default #line default
#line hidden #line hidden
#line 124 "..\..\Views\Device\Show.cshtml" #line 125 "..\..\Views\Device\Show.cshtml"
} }
@@ -466,7 +472,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 126 "..\..\Views\Device\Show.cshtml" #line 127 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowCertificates)) if (Authorization.Has(Claims.Device.ShowCertificates))
{ {
@@ -474,14 +480,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 128 "..\..\Views\Device\Show.cshtml" #line 129 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model));
#line default #line default
#line hidden #line hidden
#line 128 "..\..\Views\Device\Show.cshtml" #line 129 "..\..\Views\Device\Show.cshtml"
} }
@@ -491,13 +497,13 @@ WriteLiteral(" ");
WriteLiteral(" </div>\r\n"); WriteLiteral(" </div>\r\n");
#line 131 "..\..\Views\Device\Show.cshtml" #line 132 "..\..\Views\Device\Show.cshtml"
#line default #line default
#line hidden #line hidden
#line 131 "..\..\Views\Device\Show.cshtml" #line 132 "..\..\Views\Device\Show.cshtml"
if (requiresLive) if (requiresLive)
{ {
@@ -536,7 +542,7 @@ WriteLiteral(" <script>\r\n $(function () {\r\n
" </script>\r\n"); " </script>\r\n");
#line 178 "..\..\Views\Device\Show.cshtml" #line 179 "..\..\Views\Device\Show.cshtml"
} }
Disco.Web/Views/Device/_DeviceTable.cshtml
+3 -2
View File
@@ -41,8 +41,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/Device/_DeviceTable.generated.cs
+49 -44
View File
@@ -250,12 +250,17 @@ WriteLiteral(">");
#line default #line default
#line hidden #line hidden
WriteLiteral("</span>"); WriteLiteral("</span>\r\n");
#line 44 "..\..\Views\Device\_DeviceTable.cshtml" #line 45 "..\..\Views\Device\_DeviceTable.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
#line 45 "..\..\Views\Device\_DeviceTable.cshtml"
if (flag.Item1.Comments != null) {
#line default #line default
#line hidden #line hidden
@@ -280,14 +285,14 @@ WriteLiteral("</span>");
#line default #line default
#line hidden #line hidden
WriteLiteral("<span"); WriteLiteral("\r\n <span");
WriteLiteral(" class=\"added\""); WriteLiteral(" class=\"added\"");
WriteLiteral(">"); WriteLiteral(">");
#line 45 "..\..\Views\Device\_DeviceTable.cshtml" #line 46 "..\..\Views\Device\_DeviceTable.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
@@ -297,13 +302,13 @@ WriteLiteral("</span>\r\n </span>
" </i>\r\n"); " </i>\r\n");
#line 48 "..\..\Views\Device\_DeviceTable.cshtml" #line 49 "..\..\Views\Device\_DeviceTable.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 48 "..\..\Views\Device\_DeviceTable.cshtml" #line 49 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -313,7 +318,7 @@ WriteLiteral("</span>\r\n </span>
WriteLiteral(" </div>\r\n"); WriteLiteral(" </div>\r\n");
#line 51 "..\..\Views\Device\_DeviceTable.cshtml" #line 52 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -324,7 +329,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" "); WriteLiteral(" ");
#line 54 "..\..\Views\Device\_DeviceTable.cshtml" #line 55 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.AssetNumber); Write(item.AssetNumber);
@@ -333,27 +338,27 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n <td>\r\n"); WriteLiteral("\r\n </td>\r\n <td>\r\n");
#line 57 "..\..\Views\Device\_DeviceTable.cshtml" #line 58 "..\..\Views\Device\_DeviceTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 57 "..\..\Views\Device\_DeviceTable.cshtml" #line 58 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DecommissionedDate.HasValue) if (item.DecommissionedDate.HasValue)
{ {
#line default #line default
#line hidden #line hidden
#line 58 "..\..\Views\Device\_DeviceTable.cshtml" #line 59 "..\..\Views\Device\_DeviceTable.cshtml"
Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value)); Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value));
#line default #line default
#line hidden #line hidden
#line 58 "..\..\Views\Device\_DeviceTable.cshtml" #line 59 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -362,13 +367,13 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" </td>\r\n <td>\r\n"); WriteLiteral(" </td>\r\n <td>\r\n");
#line 61 "..\..\Views\Device\_DeviceTable.cshtml" #line 62 "..\..\Views\Device\_DeviceTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 61 "..\..\Views\Device\_DeviceTable.cshtml" #line 62 "..\..\Views\Device\_DeviceTable.cshtml"
if (string.IsNullOrWhiteSpace(item.ComputerName)) if (string.IsNullOrWhiteSpace(item.ComputerName))
{ {
@@ -382,7 +387,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">Unknown</span>\r\n"); WriteLiteral(">Unknown</span>\r\n");
#line 64 "..\..\Views\Device\_DeviceTable.cshtml" #line 65 "..\..\Views\Device\_DeviceTable.cshtml"
} }
else else
{ {
@@ -391,14 +396,14 @@ WriteLiteral(">Unknown</span>\r\n");
#line default #line default
#line hidden #line hidden
#line 67 "..\..\Views\Device\_DeviceTable.cshtml" #line 68 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.ComputerName); Write(item.ComputerName);
#line default #line default
#line hidden #line hidden
#line 67 "..\..\Views\Device\_DeviceTable.cshtml" #line 68 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -408,13 +413,13 @@ WriteLiteral(">Unknown</span>\r\n");
WriteLiteral(" </td>\r\n <td>\r\n"); WriteLiteral(" </td>\r\n <td>\r\n");
#line 71 "..\..\Views\Device\_DeviceTable.cshtml" #line 72 "..\..\Views\Device\_DeviceTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 71 "..\..\Views\Device\_DeviceTable.cshtml" #line 72 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DeviceModelDescription != null) if (item.DeviceModelDescription != null)
{ {
@@ -424,7 +429,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" <span>"); WriteLiteral(" <span>");
#line 73 "..\..\Views\Device\_DeviceTable.cshtml" #line 74 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.DeviceModelDescription); Write(item.DeviceModelDescription);
@@ -433,7 +438,7 @@ WriteLiteral(" <span>");
WriteLiteral("</span>\r\n"); WriteLiteral("</span>\r\n");
#line 74 "..\..\Views\Device\_DeviceTable.cshtml" #line 75 "..\..\Views\Device\_DeviceTable.cshtml"
} }
else else
{ {
@@ -448,7 +453,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">Unknown</span>\r\n"); WriteLiteral(">Unknown</span>\r\n");
#line 78 "..\..\Views\Device\_DeviceTable.cshtml" #line 79 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -459,7 +464,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" "); WriteLiteral(" ");
#line 81 "..\..\Views\Device\_DeviceTable.cshtml" #line 82 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.DeviceProfileName); Write(item.DeviceProfileName);
@@ -468,13 +473,13 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n <td>\r\n"); WriteLiteral("\r\n </td>\r\n <td>\r\n");
#line 84 "..\..\Views\Device\_DeviceTable.cshtml" #line 85 "..\..\Views\Device\_DeviceTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 84 "..\..\Views\Device\_DeviceTable.cshtml" #line 85 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DeviceBatchName != null) if (item.DeviceBatchName != null)
{ {
@@ -484,7 +489,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" <span>"); WriteLiteral(" <span>");
#line 86 "..\..\Views\Device\_DeviceTable.cshtml" #line 87 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.DeviceBatchName); Write(item.DeviceBatchName);
@@ -493,7 +498,7 @@ WriteLiteral(" <span>");
WriteLiteral("</span>\r\n"); WriteLiteral("</span>\r\n");
#line 87 "..\..\Views\Device\_DeviceTable.cshtml" #line 88 "..\..\Views\Device\_DeviceTable.cshtml"
} }
else else
{ {
@@ -508,7 +513,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span>\r\n"); WriteLiteral(">N/A</span>\r\n");
#line 91 "..\..\Views\Device\_DeviceTable.cshtml" #line 92 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -517,13 +522,13 @@ WriteLiteral(">N/A</span>\r\n");
WriteLiteral(" </td>\r\n <td>\r\n"); WriteLiteral(" </td>\r\n <td>\r\n");
#line 94 "..\..\Views\Device\_DeviceTable.cshtml" #line 95 "..\..\Views\Device\_DeviceTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 94 "..\..\Views\Device\_DeviceTable.cshtml" #line 95 "..\..\Views\Device\_DeviceTable.cshtml"
if (string.IsNullOrEmpty(item.AssignedUserId)) if (string.IsNullOrEmpty(item.AssignedUserId))
{ {
@@ -537,7 +542,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span>\r\n"); WriteLiteral(">N/A</span>\r\n");
#line 97 "..\..\Views\Device\_DeviceTable.cshtml" #line 98 "..\..\Views\Device\_DeviceTable.cshtml"
} }
else else
{ {
@@ -548,13 +553,13 @@ WriteLiteral(">N/A</span>\r\n");
WriteLiteral(" <span>\r\n"); WriteLiteral(" <span>\r\n");
#line 101 "..\..\Views\Device\_DeviceTable.cshtml" #line 102 "..\..\Views\Device\_DeviceTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 101 "..\..\Views\Device\_DeviceTable.cshtml" #line 102 "..\..\Views\Device\_DeviceTable.cshtml"
if (canShowUsers) if (canShowUsers)
{ {
@@ -562,14 +567,14 @@ WriteLiteral(" <span>\r\n");
#line default #line default
#line hidden #line hidden
#line 103 "..\..\Views\Device\_DeviceTable.cshtml" #line 104 "..\..\Views\Device\_DeviceTable.cshtml"
Write(Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId))); Write(Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId)));
#line default #line default
#line hidden #line hidden
#line 103 "..\..\Views\Device\_DeviceTable.cshtml" #line 104 "..\..\Views\Device\_DeviceTable.cshtml"
} }
else else
@@ -579,14 +584,14 @@ WriteLiteral(" <span>\r\n");
#line default #line default
#line hidden #line hidden
#line 107 "..\..\Views\Device\_DeviceTable.cshtml" #line 108 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.AssignedUserDescription); Write(item.AssignedUserDescription);
#line default #line default
#line hidden #line hidden
#line 107 "..\..\Views\Device\_DeviceTable.cshtml" #line 108 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -596,7 +601,7 @@ WriteLiteral(" <span>\r\n");
WriteLiteral(" </span>\r\n"); WriteLiteral(" </span>\r\n");
#line 110 "..\..\Views\Device\_DeviceTable.cshtml" #line 111 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -607,7 +612,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" "); WriteLiteral(" ");
#line 113 "..\..\Views\Device\_DeviceTable.cshtml" #line 114 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.JobCount); Write(item.JobCount);
@@ -616,7 +621,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n </tr>\r\n"); WriteLiteral("\r\n </td>\r\n </tr>\r\n");
#line 116 "..\..\Views\Device\_DeviceTable.cshtml" #line 117 "..\..\Views\Device\_DeviceTable.cshtml"
} }
@@ -651,7 +656,7 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable
" });\r\n </script>\r\n"); " });\r\n </script>\r\n");
#line 158 "..\..\Views\Device\_DeviceTable.cshtml" #line 159 "..\..\Views\Device\_DeviceTable.cshtml"
} }
else else
{ {
@@ -666,7 +671,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Devices Found</span>\r\n"); WriteLiteral(">No Devices Found</span>\r\n");
#line 162 "..\..\Views\Device\_DeviceTable.cshtml" #line 163 "..\..\Views\Device\_DeviceTable.cshtml"
} }
Disco.Web/Views/Job/JobParts/_Subject.cshtml
+6 -4
View File
@@ -237,8 +237,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span> </span>
</i> </i>
} }
@@ -488,8 +489,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+265 -253
View File
File diff suppressed because it is too large Load Diff
Disco.Web/Views/User/Show.cshtml
+3 -2
View File
@@ -22,8 +22,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw fa-lg d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw fa-lg d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/User/Show.generated.cs
+33 -27
View File
@@ -161,12 +161,17 @@ WriteLiteral(">");
#line default #line default
#line hidden #line hidden
WriteLiteral("</span>"); WriteLiteral("</span>\r\n");
#line 25 "..\..\Views\User\Show.cshtml" #line 26 "..\..\Views\User\Show.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
#line 26 "..\..\Views\User\Show.cshtml"
if (flag.Item1.Comments != null) {
#line default #line default
#line hidden #line hidden
@@ -189,6 +194,7 @@ WriteLiteral("</span>");
#line 26 "..\..\Views\User\Show.cshtml" #line 26 "..\..\Views\User\Show.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span"); WriteLiteral(" <span");
@@ -198,7 +204,7 @@ WriteLiteral(" class=\"added\"");
WriteLiteral(">"); WriteLiteral(">");
#line 26 "..\..\Views\User\Show.cshtml" #line 27 "..\..\Views\User\Show.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)); Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
@@ -207,7 +213,7 @@ WriteLiteral(">");
WriteLiteral("</span>\r\n </span>\r\n </i>\r\n"); WriteLiteral("</span>\r\n </span>\r\n </i>\r\n");
#line 29 "..\..\Views\User\Show.cshtml" #line 30 "..\..\Views\User\Show.cshtml"
} }
} }
@@ -254,7 +260,7 @@ WriteLiteral(@">
"); ");
#line 63 "..\..\Views\User\Show.cshtml" #line 64 "..\..\Views\User\Show.cshtml"
} }
@@ -263,7 +269,7 @@ WriteLiteral(@">
WriteLiteral(" "); WriteLiteral(" ");
#line 64 "..\..\Views\User\Show.cshtml" #line 65 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Subject, Model)); Write(Html.Partial(MVC.User.Views.UserParts._Subject, Model));
@@ -303,13 +309,13 @@ WriteLiteral(" id=\"UserDetailTabItems\"");
WriteLiteral("></ul>\r\n"); WriteLiteral("></ul>\r\n");
#line 100 "..\..\Views\User\Show.cshtml" #line 101 "..\..\Views\User\Show.cshtml"
#line default #line default
#line hidden #line hidden
#line 100 "..\..\Views\User\Show.cshtml" #line 101 "..\..\Views\User\Show.cshtml"
if (Authorization.HasAny(Claims.User.ShowComments, Claims.User.ShowJobs)) if (Authorization.HasAny(Claims.User.ShowComments, Claims.User.ShowJobs))
{ {
@@ -317,14 +323,14 @@ WriteLiteral("></ul>\r\n");
#line default #line default
#line hidden #line hidden
#line 102 "..\..\Views\User\Show.cshtml" #line 103 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._CommentsAndJobs, Model)); Write(Html.Partial(MVC.User.Views.UserParts._CommentsAndJobs, Model));
#line default #line default
#line hidden #line hidden
#line 102 "..\..\Views\User\Show.cshtml" #line 103 "..\..\Views\User\Show.cshtml"
} }
@@ -334,7 +340,7 @@ WriteLiteral("></ul>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 104 "..\..\Views\User\Show.cshtml" #line 105 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowAssignmentHistory)) if (Authorization.Has(Claims.User.ShowAssignmentHistory))
{ {
@@ -342,14 +348,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 106 "..\..\Views\User\Show.cshtml" #line 107 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model)); Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model));
#line default #line default
#line hidden #line hidden
#line 106 "..\..\Views\User\Show.cshtml" #line 107 "..\..\Views\User\Show.cshtml"
} }
@@ -359,7 +365,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 108 "..\..\Views\User\Show.cshtml" #line 109 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowAttachments)) if (Authorization.Has(Claims.User.ShowAttachments))
{ {
@@ -367,14 +373,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 110 "..\..\Views\User\Show.cshtml" #line 111 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model)); Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model));
#line default #line default
#line hidden #line hidden
#line 110 "..\..\Views\User\Show.cshtml" #line 111 "..\..\Views\User\Show.cshtml"
} }
@@ -384,7 +390,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 112 "..\..\Views\User\Show.cshtml" #line 113 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowFlagAssignments) || Model.User.UserFlagAssignments.CanShowAny()) if (Authorization.Has(Claims.User.ShowFlagAssignments) || Model.User.UserFlagAssignments.CanShowAny())
{ {
@@ -392,14 +398,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 114 "..\..\Views\User\Show.cshtml" #line 115 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Flags, Model)); Write(Html.Partial(MVC.User.Views.UserParts._Flags, Model));
#line default #line default
#line hidden #line hidden
#line 114 "..\..\Views\User\Show.cshtml" #line 115 "..\..\Views\User\Show.cshtml"
} }
@@ -409,7 +415,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 116 "..\..\Views\User\Show.cshtml" #line 117 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowAuthorization)) if (Authorization.Has(Claims.User.ShowAuthorization))
{ {
@@ -417,14 +423,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 118 "..\..\Views\User\Show.cshtml" #line 119 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Authorization, Model)); Write(Html.Partial(MVC.User.Views.UserParts._Authorization, Model));
#line default #line default
#line hidden #line hidden
#line 118 "..\..\Views\User\Show.cshtml" #line 119 "..\..\Views\User\Show.cshtml"
} }
@@ -434,13 +440,13 @@ WriteLiteral(" ");
WriteLiteral(" </div>\r\n"); WriteLiteral(" </div>\r\n");
#line 121 "..\..\Views\User\Show.cshtml" #line 122 "..\..\Views\User\Show.cshtml"
#line default #line default
#line hidden #line hidden
#line 121 "..\..\Views\User\Show.cshtml" #line 122 "..\..\Views\User\Show.cshtml"
if (requiresLive) if (requiresLive)
{ {
@@ -478,7 +484,7 @@ WriteLiteral(" <script>\r\n $(function () {\r\n
" });\r\n });\r\n </script>\r\n"); " });\r\n });\r\n </script>\r\n");
#line 168 "..\..\Views\User\Show.cshtml" #line 169 "..\..\Views\User\Show.cshtml"
} }
Disco.Web/Views/User/UserParts/_Subject.cshtml
+3 -2
View File
@@ -481,8 +481,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/User/UserParts/_Subject.generated.cs
+18 -11
View File
@@ -1738,12 +1738,17 @@ WriteLiteral(">");
#line default #line default
#line hidden #line hidden
WriteLiteral("</span>"); WriteLiteral("</span>\r\n");
#line 484 "..\..\Views\User\UserParts\_Subject.cshtml" #line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
if (flag.Item1.Comments != null) {
#line default #line default
#line hidden #line hidden
@@ -1766,16 +1771,18 @@ WriteLiteral("</span>");
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml" #line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("<span"); WriteLiteral(" " +
" <span");
WriteLiteral(" class=\"added\""); WriteLiteral(" class=\"added\"");
WriteLiteral(">"); WriteLiteral(">");
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml" #line 486 "..\..\Views\User\UserParts\_Subject.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
@@ -1786,7 +1793,7 @@ WriteLiteral("</span>\r\n
" </i>\r\n"); " </i>\r\n");
#line 488 "..\..\Views\User\UserParts\_Subject.cshtml" #line 489 "..\..\Views\User\UserParts\_Subject.cshtml"
} }
} }
@@ -1840,7 +1847,7 @@ WriteLiteral(">\r\n
" </tr>\r\n"); " </tr>\r\n");
#line 523 "..\..\Views\User\UserParts\_Subject.cshtml" #line 524 "..\..\Views\User\UserParts\_Subject.cshtml"
} }
@@ -1851,7 +1858,7 @@ WriteLiteral(" </tbody>\r\n
" </div>\r\n"); " </div>\r\n");
#line 528 "..\..\Views\User\UserParts\_Subject.cshtml" #line 529 "..\..\Views\User\UserParts\_Subject.cshtml"
} }
} }
else else
@@ -1867,7 +1874,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Current Device Assignments</span>\r\n"); WriteLiteral(">No Current Device Assignments</span>\r\n");
#line 533 "..\..\Views\User\UserParts\_Subject.cshtml" #line 534 "..\..\Views\User\UserParts\_Subject.cshtml"
} }
@@ -1877,7 +1884,7 @@ WriteLiteral(" </div>\r\n </div>\r\n
"\r\n"); "\r\n");
#line 537 "..\..\Views\User\UserParts\_Subject.cshtml" #line 538 "..\..\Views\User\UserParts\_Subject.cshtml"
} }
Disco.Web/Views/User/_UserTable.cshtml
+3 -2
View File
@@ -51,8 +51,9 @@
{ {
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)"> <i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
<span class="details"> <span class="details">
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null) <span class="name">@flag.Item2.flag.Name</span>
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span> @if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span> </span>
</i> </i>
} }
Disco.Web/Views/User/_UserTable.generated.cs
+24 -18
View File
@@ -242,12 +242,17 @@ WriteLiteral(">");
#line default #line default
#line hidden #line hidden
WriteLiteral("</span>"); WriteLiteral("</span>\r\n");
#line 54 "..\..\Views\User\_UserTable.cshtml" #line 55 "..\..\Views\User\_UserTable.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
#line 55 "..\..\Views\User\_UserTable.cshtml"
if (flag.Item1.Comments != null) {
#line default #line default
#line hidden #line hidden
@@ -270,6 +275,7 @@ WriteLiteral("</span>");
#line 55 "..\..\Views\User\_UserTable.cshtml" #line 55 "..\..\Views\User\_UserTable.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span"); WriteLiteral(" <span");
@@ -279,7 +285,7 @@ WriteLiteral(" class=\"added\"");
WriteLiteral(">"); WriteLiteral(">");
#line 55 "..\..\Views\User\_UserTable.cshtml" #line 56 "..\..\Views\User\_UserTable.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
@@ -289,7 +295,7 @@ WriteLiteral("</span>\r\n </span>
" </i>\r\n"); " </i>\r\n");
#line 58 "..\..\Views\User\_UserTable.cshtml" #line 59 "..\..\Views\User\_UserTable.cshtml"
} }
} }
@@ -299,7 +305,7 @@ WriteLiteral("</span>\r\n </span>
WriteLiteral(" </div>\r\n"); WriteLiteral(" </div>\r\n");
#line 61 "..\..\Views\User\_UserTable.cshtml" #line 62 "..\..\Views\User\_UserTable.cshtml"
} }
@@ -310,7 +316,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" "); WriteLiteral(" ");
#line 64 "..\..\Views\User\_UserTable.cshtml" #line 65 "..\..\Views\User\_UserTable.cshtml"
Write(item.Surname); Write(item.Surname);
@@ -321,7 +327,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" "); WriteLiteral(" ");
#line 67 "..\..\Views\User\_UserTable.cshtml" #line 68 "..\..\Views\User\_UserTable.cshtml"
Write(item.GivenName); Write(item.GivenName);
@@ -332,7 +338,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" "); WriteLiteral(" ");
#line 70 "..\..\Views\User\_UserTable.cshtml" #line 71 "..\..\Views\User\_UserTable.cshtml"
Write(item.DisplayName); Write(item.DisplayName);
@@ -343,7 +349,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" "); WriteLiteral(" ");
#line 73 "..\..\Views\User\_UserTable.cshtml" #line 74 "..\..\Views\User\_UserTable.cshtml"
Write(item.AssignedDevicesCount); Write(item.AssignedDevicesCount);
@@ -354,7 +360,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" "); WriteLiteral(" ");
#line 76 "..\..\Views\User\_UserTable.cshtml" #line 77 "..\..\Views\User\_UserTable.cshtml"
Write(item.JobCountOpen); Write(item.JobCountOpen);
@@ -363,7 +369,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 76 "..\..\Views\User\_UserTable.cshtml" #line 77 "..\..\Views\User\_UserTable.cshtml"
if (item.JobCount > item.JobCountOpen) if (item.JobCount > item.JobCountOpen)
{ {
@@ -377,7 +383,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">("); WriteLiteral(">(");
#line 78 "..\..\Views\User\_UserTable.cshtml" #line 79 "..\..\Views\User\_UserTable.cshtml"
Write(item.JobCount - item.JobCountOpen); Write(item.JobCount - item.JobCountOpen);
@@ -386,7 +392,7 @@ WriteLiteral(">(");
WriteLiteral(" Closed)</span>\r\n"); WriteLiteral(" Closed)</span>\r\n");
#line 79 "..\..\Views\User\_UserTable.cshtml" #line 80 "..\..\Views\User\_UserTable.cshtml"
} }
@@ -395,7 +401,7 @@ WriteLiteral(" Closed)</span>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n"); WriteLiteral(" </td>\r\n </tr>\r\n");
#line 82 "..\..\Views\User\_UserTable.cshtml" #line 83 "..\..\Views\User\_UserTable.cshtml"
} }
@@ -430,7 +436,7 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable
"\n </script>\r\n"); "\n </script>\r\n");
#line 124 "..\..\Views\User\_UserTable.cshtml" #line 125 "..\..\Views\User\_UserTable.cshtml"
} }
else else
{ {
@@ -445,7 +451,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Users Found</span>\r\n"); WriteLiteral(">No Users Found</span>\r\n");
#line 128 "..\..\Views\User\_UserTable.cshtml" #line 129 "..\..\Views\User\_UserTable.cshtml"
} }