Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions coldfront/core/utils/templatetags/common_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def get_icon(expand_accordion):

@register.filter
def convert_boolean_to_icon(boolean):
if boolean == False:
if boolean is False:
return mark_safe(
'<span class="badge badge-success"><i class="fas fa-check"></i></span>'
)
Expand Down Expand Up @@ -83,7 +83,7 @@ def get_value_by_index(array, index):


@register.simple_tag
def navbar_active_item(menu_item, request):
def navbar_active_item(menu_item, request=None):
view_map = {
"center-summary": ["center-summary"],
"home": ["home"],
Expand All @@ -107,7 +107,10 @@ def navbar_active_item(menu_item, request):
"grant-report",
],
}
view_name = request.resolver_match.view_name
resolver_match = getattr(request, "resolver_match", None)
view_name = getattr(resolver_match, "view_name", None)
if view_name is None:
return ""

if menu_item in view_map:
if view_name in view_map[menu_item]:
Expand Down
22 changes: 21 additions & 1 deletion coldfront/core/utils/tests/tests.py
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
# Create your tests here.
from django.template import Context, Template
from django.test import RequestFactory, SimpleTestCase
from django.urls import resolve


class NavbarActiveItemTests(SimpleTestCase):
def test_missing_request_context_returns_empty_string(self):
template = Template("{% load common_tags %}{% navbar_active_item 'home' request %}")

rendered = template.render(Context({}))

self.assertEqual(rendered, "")

def test_matching_view_returns_active(self):
template = Template("{% load common_tags %}{% navbar_active_item 'home' request %}")
request = RequestFactory().get("/")
request.resolver_match = resolve("/")

rendered = template.render(Context({"request": request}))

self.assertEqual(rendered, "active")
Loading