Skip to content

Commit 3cb7200

Browse files
committed
Merge branch 'release/1.5.4'
* release/1.5.4: updates CHANGES Bump version: 1.5.3 → 1.5.4 add tests allow write visbile property updates Makefile
2 parents 91201b1 + 19eb271 commit 3cb7200

File tree

7 files changed

+23
-3
lines changed

7 files changed

+23
-3
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.5.3
2+
current_version = 1.5.4
33
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
44
serialize = {major}.{minor}.{patch}
55
commit = True

CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.5.4
2+
-----
3+
* allow overwrite visible inside handler
4+
5+
16
1.5.3
27
-----
38
* bug fixing

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ develop:
1717

1818
clean:
1919
# cleaning
20-
@rm -fr dist '~build' .pytest_cache .coverage src/admin_extra_buttons.egg-info
20+
@rm -fr dist '~build' coverage.xml pytest.xml .*.sqlite .pytest_cache .coverage src/django_admin_extra_buttons.egg-info
2121
@find . -name __pycache__ -o -name .eggs | xargs rm -rf
2222
@find . -name "*.py?" -o -name ".DS_Store" -o -name "*.orig" -o -name "*.min.min.js" -o -name "*.min.min.css" -prune | xargs rm -rf
2323

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
NAME = 'django-admin-extra-buttons'
2-
VERSION = __version__ = '1.5.3'
2+
VERSION = __version__ = '1.5.4'
33
__author__ = 'sax'

src/admin_extra_buttons/buttons.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ def visible(self):
9696

9797
return self._visible
9898

99+
@visible.setter
100+
def visible(self, value):
101+
self._visible = value
102+
99103
@property
100104
def request(self):
101105
if not self.context: # pragma: no cover

tests/demoapp/demo/admin.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ def disabled(self, request):
9696
def enabled(self, request):
9797
pass
9898

99+
@link(href="https://www.google.com/", visible=lambda btn: True)
100+
def invisible(self, button):
101+
button.visible = False
102+
99103
@button()
100104
def error_message(self, request):
101105
try:

tests/test_admin.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from django.urls import reverse
2+
3+
4+
def test_admin(app, admin_user):
5+
url = reverse('admin:demo_demomodel1_changelist')
6+
res = app.get(url, user=admin_user)
7+
assert res.status_code == 200

0 commit comments

Comments
 (0)