VimPlug/django-stubs
1
0
Fork 0
mirror of https://github.com/davidhalter/django-stubs.git synced 2025-12-10 05:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

admin: Allow ModelAdmin.actions to contain str (#425)

Browse Source 
Strings are allowed in ModelAdmin.actions when they refer to a method on
the ModelAdmin subclass.
This commit is contained in:
Daniel Hillier
2020-07-14 17:43:50 +10:00
committed by GitHub
parent 92ef5d9d95
commit 19c73a106d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django-stubs/contrib/admin/options.pyi
View File

@@ -135,7 +135,7 @@ class ModelAdmin(BaseModelAdmin):
delete_selected_confirmation_template: str = ... delete_selected_confirmation_template: str = ...
object_history_template: str = ... object_history_template: str = ...
popup_response_template: str = ... popup_response_template: str = ...
actions: Sequence[Callable[[ModelAdmin, HttpRequest, QuerySet], None]] = ... actions: Sequence[Union[Callable[[ModelAdmin, HttpRequest, QuerySet], None], str]] = ...
action_form: Any = ... action_form: Any = ...
actions_on_top: bool = ... actions_on_top: bool = ...
actions_on_bottom: bool = ... actions_on_bottom: bool = ...

8
test-data/typecheck/contrib/admin/test_options.yml
View File

@@ -65,11 +65,15 @@
delete_selected_confirmation_template = "template" delete_selected_confirmation_template = "template"
object_history_template = "template" object_history_template = "template"
popup_response_template = "template" popup_response_template = "template"
actions = (an_action,) actions = (an_action, "a_method_action")
actions_on_top = True actions_on_top = True
actions_on_bottom = False actions_on_bottom = False
actions_selection_counter = True actions_selection_counter = True
admin_site = AdminSite() admin_site = AdminSite()
def a_method_action(self, request, queryset):
pass
# This test is here to make sure we're not running into a mypy issue which is # This test is here to make sure we're not running into a mypy issue which is
# worked around using a somewhat complicated _ListOrTuple union type. Once the # worked around using a somewhat complicated _ListOrTuple union type. Once the
# issue is solved upstream this test should pass even with the workaround # issue is solved upstream this test should pass even with the workaround
@@ -123,4 +127,4 @@
pass pass
class A(admin.ModelAdmin): class A(admin.ModelAdmin):
actions = [an_action] # E: List item 0 has incompatible type "Callable[[None], None]"; expected "Callable[[ModelAdmin, HttpRequest, QuerySet[Any]], None]" actions = [an_action] # E: List item 0 has incompatible type "Callable[[None], None]"; expected "Union[Callable[[ModelAdmin, HttpRequest, QuerySet[Any]], None], str]"