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

Passing multiple template names to the templating engine. Django will… #920

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

Passing multiple template names to the templating engine. Django will… #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
9b46531
Passing multiple template names to the templating engine. Django will…
benf710 Nov 23, 2021
3f25759
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 23, 2021
3be641c
Merge branch 'jazzband:master' into custom-admin-templates
benf710 Jan 28, 2022
1e8e0ea
Merge branch 'jazzband:master' into custom-admin-templates
benf710 Mar 27, 2022
9eef062
Passing multiple template names to the templating engine. Django will…
benf710 Nov 23, 2021
84c9595
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 23, 2021
1bfb777
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 6, 2021
f2f1008
Bump black from 21.11b1 to 21.12b0 in /requirements
dependabot[bot] Dec 6, 2021
75af5a0
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 27, 2021
48baa93
Bump sphinx from 4.3.1 to 4.3.2 in /requirements
dependabot[bot] Dec 20, 2021
63c87c8
Bump tox from 3.24.4 to 3.24.5 in /requirements
dependabot[bot] Dec 29, 2021
f721c38
Bump psycopg2-binary from 2.9.2 to 2.9.3 in /requirements
dependabot[bot] Dec 29, 2021
cbdff44
test against django 4.0 proper
jeking3 Jan 2, 2022
db9ce84
fix test due to behavior change on main
jeking3 Jan 17, 2022
c42a39d
Bump tox-gh-actions from 2.8.1 to 2.9.1 in /requirements
dependabot[bot] Jan 24, 2022
577d756
Bump sphinx from 4.3.2 to 4.4.0 in /requirements
dependabot[bot] Jan 24, 2022
71b4ae4
Add a queryset based `as_of` support.
jeking3 Aug 11, 2021
ae17f71
drop support for python 3.6, past EOL date
jeking3 Jan 27, 2022
5abf3bc
Bump coverage from 6.2 to 6.3 in /requirements
dependabot[bot] Jan 27, 2022
0b3de96
add support for verbose_name_plural
Aug 26, 2021
4226a29
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 28, 2022
75a30d4
add unit tests for verbose name plural
Jan 28, 2022
91f3f3b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 28, 2022
6fbc9ac
add name to authors
Jan 28, 2022
d32dd8e
Fix diff_against on model with non-editable fields
dracos Nov 25, 2021
27157f3
Bump coverage from 6.3 to 6.3.1 in /requirements
dependabot[bot] Feb 2, 2022
cbdc7ec
Remove remaining parts of Python3.6
hramezani Feb 2, 2022
d74a5c3
Dropped support for Django 3.1
hramezani Feb 2, 2022
b51c5cc
Add Django4.0 to supported Django and Python table in docs.
hramezani Feb 2, 2022
c8ac421
Bump black from 21.12b0 to 22.1.0 in /requirements
dependabot[bot] Feb 3, 2022
c01d2e0
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jan 31, 2022
1cd7df9
Update syntax to Python3.7+
hramezani Feb 3, 2022
11bbc93
Minor typo fixes
skept Feb 5, 2022
e943b87
Add isort to pre-commit configuration.
hramezani Feb 6, 2022
1734282
Use pre-commit on tox lint.
hramezani Feb 9, 2022
7e11b8c
Bump coverage from 6.3.1 to 6.3.2 in /requirements
dependabot[bot] Feb 21, 2022
0750bab
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Mar 7, 2022
3657278
Issue 720 no db indices (#782)
Sult Mar 14, 2022
a65eb19
Add HistoricForeignKey for chasing relationships through a timepoint.
jeking3 Sep 13, 2021
9df20da
Make change reason customizable with overriding.
amartis Mar 19, 2022
52389f0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2022
45eb7be
Add to CHANGES.rst
amartis Mar 20, 2022
b6e681d
Merge branch 'jazzband:master' into custom-admin-templates
benf710 Jan 21, 2023
d376989
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 21, 2023
4681cfb
Added default templates const to resolve references in test_admin.py/…
benf710 Jan 22, 2023
aed4618
Merge remote-tracking branch 'origin/custom-admin-templates' into cus…
benf710 Jan 22, 2023
1a11e94
Merge pull request #1 from jazzband/master
benf710 Mar 17, 2023
4a7489d
Merge branch 'master' into custom-admin-templates
benf710 Mar 17, 2023
8a3d88e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 17, 2023
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
24 changes: 19 additions & 5 deletions simple_history/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@


class SimpleHistoryAdmin(admin.ModelAdmin):
object_history_template = "simple_history/object_history.html"
object_history_form_template = "simple_history/object_history_form.html"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on CI, something depends on this (could just be tests - didn't look).


def get_urls(self):
"""Returns the additional urls used by the Reversion admin."""
urls = super().get_urls()
Expand Down Expand Up @@ -94,7 +91,15 @@ def history_view(self, request, object_id, extra_context=None):
context.update(extra_context or {})
extra_kwargs = {}
return self.render_history_view(
request, self.object_history_template, context, **extra_kwargs
request,
[
f"admin/{app_label}/{opts.model_name}/object_history.html",
"admin/%s/object_history.html" % app_label,
"admin/object_history.html",
"simple_history/object_history.html",
],
context,
**extra_kwargs,
)

def history_view_title(self, obj):
Expand Down Expand Up @@ -208,7 +213,16 @@ def history_form_view(self, request, object_id, version_id, extra_context=None):
context.update(extra_context or {})
extra_kwargs = {}
return self.render_history_view(
request, self.object_history_form_template, context, **extra_kwargs
request,
[
"admin/%s/%s/object_history_form.html"
% (original_opts.app_label, model_name),
"admin/%s/object_history_form.html" % original_opts.app_label,
"admin/object_history_form.html",
"simple_history/object_history_form.html",
],
context,
**extra_kwargs,
)

def history_form_view_title(self, obj):
Expand Down
10 changes: 5 additions & 5 deletions simple_history/tests/tests/test_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ def test_history_form_view_without_getting_history(self):
context["log_entries"] = ANY

mock_render.assert_called_once_with(
request, admin.object_history_form_template, context
request, admin.default_object_history_form_template, context
)

def test_history_form_view_getting_history(self):
Expand Down Expand Up @@ -548,7 +548,7 @@ def test_history_form_view_getting_history(self):
context["log_entries"] = ANY

mock_render.assert_called_once_with(
request, admin.object_history_form_template, context
request, admin.default_object_history_form_template, context
)

def test_history_form_view_getting_history_with_setting_off(self):
Expand Down Expand Up @@ -606,7 +606,7 @@ def test_history_form_view_getting_history_with_setting_off(self):
context["log_entries"] = ANY

mock_render.assert_called_once_with(
request, admin.object_history_form_template, context
request, admin.default_object_history_form_template, context
)

def test_history_form_view_getting_history_abstract_external(self):
Expand Down Expand Up @@ -666,7 +666,7 @@ def test_history_form_view_getting_history_abstract_external(self):
context["log_entries"] = ANY

mock_render.assert_called_once_with(
request, admin.object_history_form_template, context
request, admin.default_object_history_form_template, context
)

def test_history_form_view_accepts_additional_context(self):
Expand Down Expand Up @@ -728,7 +728,7 @@ def test_history_form_view_accepts_additional_context(self):
context["log_entries"] = ANY

mock_render.assert_called_once_with(
request, admin.object_history_form_template, context
request, admin.default_object_history_form_template, context
)

def test_history_view__title_suggests_revert_by_default(self):
Expand Down