Update link to ratings in reviewer tools for disabled addons. #15751
Conversation
|
@eviljeff Please review |
eviljeff
requested review from
a team and
bobsilverberg
and removed request for
a team
| {# Using num=count so we don't change an L10n string. #} | ||
| {% if not addon.is_disabled or action_allowed(amo.permissions.RATINGS_MODERATE) %} | ||
| {% set review_url = url('addons.ratings.list', addon.slug) %} | ||
| {% if addon.is_disabled %} |
There was a problem hiding this comment.
we want this always when the user has the permission
There was a problem hiding this comment.
see the original comment in the issue - the two alternatives are having the permission and not.
There was a problem hiding this comment.
We want to only linkify if the user has permission Ratings:Moderate, otherwise leave it unlinked. Is it right ?
| {# Using num=count so we don't change an L10n string. #} | ||
| {% if acl_is_review_moderator %} | ||
| {% set review_url = url('admin:ratings_rating_changelist')|urlparams(addon=addon.pk) %} | ||
| <a href="{{ review_url|absolutify }}"><strong>{{ | ||
| ngettext('{num} review', '{num} reviews', num)|format_html(num=count) | ||
| }}</strong></a> | ||
| {% else %} | ||
| <strong>{{ | ||
| ngettext('{num} review', '{num} reviews', num)|format_html(num=count) | ||
| }}</strong> | ||
| {% endif %} |
There was a problem hiding this comment.
We don't want to have to define the same string twice, so we should also define it separately, like:
| {# Using num=count so we don't change an L10n string. #} | |
| {% if acl_is_review_moderator %} | |
| {% set review_url = url('admin:ratings_rating_changelist')|urlparams(addon=addon.pk) %} | |
| <a href="{{ review_url|absolutify }}"><strong>{{ | |
| ngettext('{num} review', '{num} reviews', num)|format_html(num=count) | |
| }}</strong></a> | |
| {% else %} | |
| <strong>{{ | |
| ngettext('{num} review', '{num} reviews', num)|format_html(num=count) | |
| }}</strong> | |
| {% endif %} | |
| {# Using num=count so we don't change an L10n string. #} | |
| {% set review_url_text = ngettext('{num} review', '{num} reviews', num)|format_html(num=count) %} | |
| {% if acl_is_review_moderator %} | |
| {% set review_url = url('admin:ratings_rating_changelist')|urlparams(addon=addon.pk) %} | |
| <a href="{{ review_url|absolutify }}"><strong>{{ review_url_text }}</strong></a> | |
| {% else %} | |
| <strong>{{ review_url_text }}</strong> | |
| {% endif %} |
|
@wagnerand before I merge this, is it really only |
|
@eviljeff I believe so (https://github.com/mozilla/addons-server/blob/master/src/olympia/constants/permissions.py#L215:L215), unless I am missing something? |
I thought maybe a check that the user was able to actually access django admin ( |
Fixes mozilla/addons#6223
If the addon is public,
X reviewspoints to the public ratings pageIf the addon is not public and user has the
Ratings:Moderatepermission, pointing to /admin/models/ratings/rating/?addon=. For users that don't have that permission (ie regular reviewers, they would still see that text, but without a link.PRs open for the same issue.
Fixes #ISSUENUMat the top of your PR.