File tree Expand file tree Collapse file tree 7 files changed +15
-8
lines changed
djangocms_references/templates/djangocms_versioning_filer/admin/action_buttons Expand file tree Collapse file tree 7 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ py37default: &py37default
1010 - attach_workspace :
1111 at : /tmp/images
1212 - run : docker load -i /tmp/images/py37.tar || true
13- - run : docker run py37 tox -e $CIRCLE_STAGE
13+ - run : docker run py37 tox -e $CIRCLE_JOB
1414
1515py38default : &py38default
1616 docker :
@@ -22,7 +22,7 @@ py38default: &py38default
2222 - attach_workspace :
2323 at : /tmp/images
2424 - run : docker load -i /tmp/images/py38.tar || true
25- - run : docker run py38 tox -e $CIRCLE_STAGE
25+ - run : docker run py38 tox -e $CIRCLE_JOB
2626
2727py39default : &py39default
2828 docker :
@@ -34,7 +34,7 @@ py39default: &py39default
3434 - attach_workspace :
3535 at : /tmp/images
3636 - run : docker load -i /tmp/images/py39.tar || true
37- - run : docker run py39 tox -e $CIRCLE_STAGE
37+ - run : docker run py39 tox -e $CIRCLE_JOB
3838
3939
4040py37_requires : &py37_requires
Original file line number Diff line number Diff line change @@ -4,6 +4,9 @@ Changelog
44
55Unreleased
66==========
7+ * fix: URL of `show references ` in action list of djangocms-versioning-filer list page
8+ * fix: Added CMS_CONFIRM_VERSION4 in test_settings to show intent of using v4
9+ * fix: fix circleci build errors
710
8111.4.2 (2022-05-23)
912==================
Original file line number Diff line number Diff line change 22
33{% get_versioning_filer_references_url file as references_url %}
44< a href ="{{ references_url }} "
5- title ="{% blocktrans %}Show references{% endblocktrans %} " class ="action-button "> < span class ="fa fa-code-fork "> </ span > </ a >
5+ title ="{% blocktrans %}Show references{% endblocktrans %} " class ="action-button cms-form-get-method "> < span class ="fa fa-code-fork "> </ span > </ a >
Original file line number Diff line number Diff line change 11-r ./requirements_base.txt
22
3- Django>=2.2,<3 .0
3+ Django>=2.2,<4 .0
Original file line number Diff line number Diff line change 66tox
77
88# Unreleased django-cms 4.0 compatible packages
9- https://github.com/django-cms/django-cms/tarball/develop-4 #egg=django-cms
10- https://github.com/django-cms/djangocms-versioning/tarball/master #egg=djangocms-versioning
11- https://github.com/django-cms/djangocms-alias/tarball/master #egg=djangocms-alias
9+ https://github.com/django-cms/django-cms/tarball/4.0.0 #egg=django-cms
10+ https://github.com/django-cms/djangocms-versioning/tarball/1.2.2 #egg=djangocms-versioning
11+ https://github.com/django-cms/djangocms-alias/tarball/1.11.0 #egg=djangocms-alias
Original file line number Diff line number Diff line change 88 "djangocms_references.test_utils.polls" ,
99 "djangocms_references.test_utils.nested_references_app" ,
1010 ],
11+ "CMS_CONFIRM_VERSION4" : True ,
1112 "MIGRATION_MODULES" : {
1213 "auth" : None ,
1314 "cms" : None ,
Original file line number Diff line number Diff line change 66
77from djangocms_alias .admin import AliasContentAdmin
88from djangocms_alias .models import Alias , AliasContent , Category
9+ from djangocms_versioning .models import Version
910
1011
1112class AliasAdminReferencesMonkeyPatchTestCase (CMSTestCase ):
@@ -22,6 +23,8 @@ def test_list_display(self):
2223 name = "Alias Reference Monkey Patch Content" ,
2324 language = "en" ,
2425 )
26+
27+ Version .objects .create (content = alias_content , created_by = request .user )
2528 content_type = ContentType .objects .get (app_label = alias ._meta .app_label , model = alias ._meta .model_name )
2629 alias_admin = AliasContentAdmin (AliasContent , admin .AdminSite ())
2730 func = alias_admin .get_list_display (request )[- 1 ]
You can’t perform that action at this time.
0 commit comments