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

bug: on the home page a white bar appeared at the bottom of the screen when there was a pending enrolment

Browse Source
This commit is contained in:
Gary Sharp
2026-01-22 15:22:23 +11:00
parent 834d2f8fae
commit 71fa53bfb2
2 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Job/Index.cshtml
+7 -7
View File
@@ -145,12 +145,6 @@
@Html.Partial(MVC.Shared.Views._JobTable, Model.StaleJobs, new ViewDataDictionary())
</div>
}
@if (Authorization.Has(Claims.Job.Actions.Export))
{
<div class="actionBar">
@Html.ActionLinkButton("Export Jobs", MVC.Job.Export())
</div>
}
@if (Model.PendingEnrolments != null && Model.PendingEnrolments.Count > 0 && Authorization.Has(Claims.Device.Actions.EnrolDevices))
{
<div id="pendingEnrolments">
@@ -166,4 +160,10 @@
.appendTo(layout_PageHeading);
});
</script>
}
}
@if (Authorization.Has(Claims.Job.Actions.Export))
{
<div class="actionBar">
@Html.ActionLinkButton("Export Jobs", MVC.Job.Export())
</div>
}
Disco.Web/Views/Job/Index.generated.cs
+37 -36
View File
@@ -306,38 +306,6 @@ WriteLiteral("\r\n </div>\r\n");
#line hidden
#line 148 "..\..\Views\Job\Index.cshtml"
if (Authorization.Has(Claims.Job.Actions.Export))
{
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" class=\"actionBar\"");
WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 151 "..\..\Views\Job\Index.cshtml"
Write(Html.ActionLinkButton("Export Jobs", MVC.Job.Export()));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
#line 153 "..\..\Views\Job\Index.cshtml"
}
#line default
#line hidden
#line 154 "..\..\Views\Job\Index.cshtml"
if (Model.PendingEnrolments != null && Model.PendingEnrolments.Count > 0 && Authorization.Has(Claims.Device.Actions.EnrolDevices))
{
@@ -355,14 +323,14 @@ WriteLiteral(" class=\"fa fa-exclamation-circle info\"");
WriteLiteral("></i>\r\n <div>There are device enrolments pending approval.</div>\r\n " +
"<a");
WriteAttribute("href", Tuple.Create(" href=\"", 6926), Tuple.Create("\"", 6975)
WriteAttribute("href", Tuple.Create(" href=\"", 6762), Tuple.Create("\"", 6811)
#line 159 "..\..\Views\Job\Index.cshtml"
, Tuple.Create(Tuple.Create("", 6933), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Enrolment.Status())
#line 153 "..\..\Views\Job\Index.cshtml"
, Tuple.Create(Tuple.Create("", 6769), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.Enrolment.Status())
#line default
#line hidden
, 6933), false)
, 6769), false)
);
WriteLiteral(" class=\"button small alert\"");
@@ -377,8 +345,41 @@ WriteLiteral(" <script>\r\n $(function () {\r\n var layout_
" </script>\r\n");
#line 163 "..\..\Views\Job\Index.cshtml"
}
#line default
#line hidden
#line 164 "..\..\Views\Job\Index.cshtml"
if (Authorization.Has(Claims.Job.Actions.Export))
{
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" class=\"actionBar\"");
WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 167 "..\..\Views\Job\Index.cshtml"
Write(Html.ActionLinkButton("Export Jobs", MVC.Job.Export()));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
#line 169 "..\..\Views\Job\Index.cshtml"
}
#line default
#line hidden