Skip to content

Commit 1c2112b

Browse files
committed
RE1-T112 Fixes
1 parent 82482bf commit 1c2112b

4 files changed

Lines changed: 21 additions & 12 deletions

File tree

Web/Resgrid.Web/Areas/User/Views/Dispatch/Dashboard.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@{
66
ViewBag.Title = "Resgrid | " + @commonLocalizer["CallsModule"];
77
Layout = "~/Areas/User/Views/Shared/_UserLayout.cshtml";
8+
ViewBag.LoadAngular = true;
89
}
910
@section Styles
1011
{

Web/Resgrid.Web/Areas/User/Views/Mapping/Index.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@inject IStringLocalizer<Resgrid.Localization.Areas.User.Mapping.Mapping> localizer
55
@{
66
ViewBag.Title = "Resgrid | " + localizer["MappingHeader"];
7+
ViewBag.LoadAngular = true;
78
}
89
@section Styles
910
{

Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

1818
<link rel="stylesheet" href="/css/int-bundle.css" />
1919

20-
<link rel="stylesheet" href="/js/ng/styles.css" />
21-
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
20+
@if (ViewBag.LoadAngular == true)
21+
{
22+
<link rel="stylesheet" href="/js/ng/styles.css" />
23+
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
24+
}
2225

2326
<link rel="shortcut icon" href="~/favicon.ico" />
2427
<link rel="apple-touch-icon" sizes="180x180" href="~/images/apple-touch-icon.png">
@@ -127,16 +130,19 @@
127130
localStorage.setItem("RgWebApp.auth-tokens", '@Html.Raw(await JavasriptHelpers.GetApiToken())');
128131
</script>
129132

130-
<environment names="Release,Staging,Production,Docker">
131-
<script src="/js/ng/app.js"></script>
132-
</environment>
133-
134-
<environment names="Development">
135-
<script src="/js/ng/runtime.js" asp-append-version="false"></script>
136-
<script src="/js/ng/polyfills.js" asp-append-version="false"></script>
137-
<script src="/js/ng/vendor.js" asp-append-version="false"></script>
138-
<script src="/js/ng/main.js" asp-append-version="false"></script>
139-
</environment>
133+
@if (ViewBag.LoadAngular == true)
134+
{
135+
<environment names="Release,Staging,Production,Docker">
136+
<script src="/js/ng/app.js"></script>
137+
</environment>
138+
139+
<environment names="Development">
140+
<script src="/js/ng/runtime.js" asp-append-version="false"></script>
141+
<script src="/js/ng/polyfills.js" asp-append-version="false"></script>
142+
<script src="/js/ng/vendor.js" asp-append-version="false"></script>
143+
<script src="/js/ng/main.js" asp-append-version="false"></script>
144+
</environment>
145+
}
140146

141147
@if (IsSectionDefined("Scripts"))
142148
{

Web/Resgrid.Web/Areas/User/Views/Shifts/Index.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@{
66
ViewBag.Title = "Resgrid | " + localizer["ShiftsHeader"];
77
Layout = "~/Areas/User/Views/Shared/_UserLayout.cshtml";
8+
ViewBag.LoadAngular = true;
89
}
910

1011
@section Styles

0 commit comments

Comments
 (0)