Allow None on view_on_site
#2419
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This makes it consistent with `get_view_on_site_url` signature where it is used.
sobolevn
reviewed
Oct 25, 2024
| @@ -139,7 +139,7 @@ class BaseModelAdmin(Generic[_ModelT]): | |||
| def has_view_or_change_permission(self, request: HttpRequest, obj: _ModelT | None = ...) -> bool: ... | |||
| def has_module_permission(self, request: HttpRequest) -> bool: ... | |||
| @property | |||
| def view_on_site(self) -> Callable[[_ModelT], str] | bool: ... | |||
| def view_on_site(self) -> Callable[[_ModelT], str | None] | bool: ... | |||
There was a problem hiding this comment.
Sorry, this does not seem correct. Pls, see https://github.com/django/django/blob/6dcab75d5d8c2ef18de15323930057e6fa9ec00f/django/contrib/admin/options.py#L358-L363
There was a problem hiding this comment.
Sorry, but the linked code doesn't deal with the return value from the callable at all.
view_on_site can be either a boolean, or a callable returning a string or None. When callable returns None, get_view_on_site_url will return None, what is a valid return value here (as can be seen in the code you linked, which returns None as well when view_on_site is false).
There was a problem hiding this comment.
My bad, I misread the type :)
Thanks for the clarification.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have made things!
Related issues
This makes it consistent with
get_view_on_site_urlsignature where it is used.