Skip to content

Commit

Permalink
fix: Changed model title to uppercase (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernardvdv authored Jun 29, 2022
1 parent 5feacb8 commit 9e350bb
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Changelog
unreleased
==========
* feat: Expiry field removed from version table and replaced with compliance number. Added additional content settings action to version table
* fix: Changed model title to uppercase

1.3.1 (2022-06-22)
==================
Expand Down
2 changes: 1 addition & 1 deletion djangocms_content_expiry/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Media:
}

def change_view(self, request, object_id, extra_context=None):
extra_context = {'title': 'Additional content settings'}
extra_context = {'title': 'Additional Content Settings'}
return super(ContentExpiryAdmin, self).change_view(request, object_id, extra_context=extra_context)

def get_queryset(self, request):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load static i18n %}

<a class="btn cms-versioning-action-btn related-widget-wrapper-link" href="{{ url }}" title="{% trans 'Additional content settings' %}">
<a class="btn cms-versioning-action-btn related-widget-wrapper-link" href="{{ url }}" title="{% trans 'Additional Content Settings' %}">
<img src="{% static 'djangocms_content_expiry/svg/file.svg' %}">
</a>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% load static i18n %}
<a class="btn cms-content-expiry-action-btn" href="{{ url }}" title="{% trans 'Additional content settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/edit.svg' %}" /></span></a>
<a class="btn cms-content-expiry-action-btn" href="{{ url }}" title="{% trans 'Additional Content Settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/edit.svg' %}" /></span></a>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% load static i18n %}
<a class="btn cms-moderation-action-btn js-moderation-action related-widget-wrapper-link cms-versioning-action-btn" id="change_content_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional content settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/file.svg' %}" /></span></a>
<a class="btn cms-moderation-action-btn js-moderation-action related-widget-wrapper-link cms-versioning-action-btn" id="change_content_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/file.svg' %}" /></span></a>
4 changes: 2 additions & 2 deletions tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def test_change_form_title(self):
response = self.client.get(endpoint)

self.assertEqual(response.status_code, 200)
self.assertEqual(response.context_data['title'], 'Additional content settings')
self.assertEqual(response.context_data['title'], 'Additional Content Settings')


class ContentExpiryChangelistTestCase(CMSTestCase):
Expand Down Expand Up @@ -167,7 +167,7 @@ def test_change_icon_tooltip(self):
link_title_tooltip = actual_link.get("title")

self.assertEqual(
link_title_tooltip, 'Additional content settings'
link_title_tooltip, 'Additional Content Settings'
)


Expand Down

0 comments on commit 9e350bb

Please sign in to comment.