Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bg/240388 rating field visibility #627

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Bg/240388 rating field visibility #627

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd6d881
Rating field visibility
BarryGibney Dec 4, 2024
47a8f3a
problem in IDE
BarryGibney Dec 4, 2024
2e98120
Merge branch 'dev' into BG/240388_Rating_Field_Visibility
BarryGibney Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Web/Edubase.Web.UI/Areas/Establishments/Views/EstablishmentsSearch/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,8 @@

@Selector("Government Office Region", M.BIND_ALIAS_GOR, Model.GORs.OrderBy(x => x.Name), Model.SelectedGORIds, "additional-search-critera hidden", true)


@Selector("Nursery provision", M.BIND_ALIAS_NURSERY, Model.NurseryProvisions.OrderBy(x => x.Name), Model.SelectedNurseryProvisionIds, "additional-search-critera hidden", true)

@Selector("Ofsted rating", M.BIND_ALIAS_OFSTEDRATINGS, Model.OfstedRatings.OrderBy(x => x.Name), Model.SelectedOfstedRatingIds, "additional-search-critera hidden", true)

@Selector("Parliamentary constituency", M.BIND_ALIAS_PARLCONST, Model.ParliamentaryConstituencies.OrderBy(x => x.Name), Model.SelectedParliamentaryConstituencyIds, "additional-search-critera hidden", true, true)

@Selector("Religious ethos", M.BIND_ALIAS_RELETHOS, Model.ReligiousEthoses.OrderBy(x => x.Name), Model.SelectedReligiousEthosIds, "additional-search-critera hidden", true, true)
Expand Down
2 changes: 1 addition & 1 deletion Web/Edubase.Web.UI/Controllers/HomeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public ActionResult CookieChoices(bool acceptAnalyticsCookies)
var returnTo = Request.Form["OriginatingPage"];
Response.Cookies.Set(new HttpCookie(UserPrefsCookieName, acceptAnalyticsCookies.ToString()) { Expires = DateTime.Today.AddDays(28), SameSite = SameSiteMode.Lax, Domain = cookieDomain });
TempData["CookiesPrefsSaved"] = acceptAnalyticsCookies;
if (!string.IsNullOrEmpty(returnTo) && urlHelper.IsLocalUrl(returnTo))
if (returnTo != null)
{
return Redirect(returnTo);
}
Expand Down
Loading