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

Jump to bottom

Avoid null exception when href is null. #15765

Merged
merged 6 commits into from
Apr 22, 2024
Merged

Avoid null exception when href is null. #15765

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7bbbe49
Avoid throwing null exception
MikeAlhayek Apr 15, 2024
ab3a974
update
MikeAlhayek Apr 15, 2024
4e77698
Update NavigationItemLink-admin.cshtml
MikeAlhayek Apr 15, 2024
c6d384c
Update NavigationItemLink-admin.cshtml
MikeAlhayek Apr 15, 2024
b8cef9c
Merge branch 'main' into ma/avoid-null-exception
MikeAlhayek Apr 15, 2024
351290c
Merge branch 'main' into ma/avoid-null-exception
MikeAlhayek Apr 18, 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
17 changes: 10 additions & 7 deletions src/OrchardCore.Themes/TheAdmin/Views/NavigationItemLink-admin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,26 @@

TagBuilder tag = Tag(Model, "a");
tag.Attributes["id"] = null;
tag.Attributes["href"] = Model.Href;

if (Model.Href.ToString() == "#")
if (Model.Href == null || Model.Href.ToString() == "#")
{
tag.Attributes["href"] = "#m" + Model.GetHashCode().ToString();
}
else
{
tag.Attributes["href"] = Model.Href;
}

var prefix = "icon-class-";

// Extract classes that are not icons from Model.Classes
// Extract classes that are not icons from Model.Classes.
var notIconClasses = ((IEnumerable<string>)Model.Classes)
.ToList()
.Where(c => !c.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
.Where(c => !c.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
.ToArray();

if (notIconClasses.Count() > 0)
if (notIconClasses.Length > 0)
{
tag.Attributes["class"] = string.Join(" ", notIconClasses);
tag.Attributes["class"] = string.Join(' ', notIconClasses);
}

tag.AddCssClass("item-label d-flex");
Expand Down