Skip to content

Remove the bookmarks filter if anon user #398 #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robcowie wants to merge 1 commit into from
Closed

Remove the bookmarks filter if anon user #398 #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sentry/templates/sentry/groups/group_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@
{% block sidebar %}
{% querystring from request without bookmarks as bookmark_querystring %}
<h6>{% trans "Bookmarks" %}</h6>
<form>
<ul class="nav nav-tabs nav-stacked filter-list">
{% if request.user.is_anonymous %}
<li class="active"><a href="?">{% trans "All Events" %}</a></li>
{% else %}
<li{% if not request.GET.bookmarks %} class="active"{% endif %}><a href="?{{ bookmark_querystring }}">{% trans "All Events" %}</a></li>
<li{% if request.GET.bookmarks %} class="active"{% endif %}><a href="?{{ bookmark_querystring }}&amp;bookmarks=1">{% trans "Only Bookmarks" %}</a></li>
{% endif %}
</ul>

{% for filter in filters %}
Expand Down
10 changes: 6 additions & 4 deletions sentry/web/frontend/groups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,12 @@ def _get_group_list(request, project, view=None):

event_list = Group.objects
if request.GET.get('bookmarks'):
event_list = event_list.filter(
bookmark_set__project=project,
bookmark_set__user=request.user,
)
# Ignore this filter if anon user
if not request.user.is_anonymous():
event_list = event_list.filter(
bookmark_set__project=project,
bookmark_set__user=request.user,
)
else:
event_list = event_list.filter(project=project)

Expand Down