3 participants
robcowie
commented
heynemann
commented
This seems like a good pull request. Sentry should never 500.
Any idea on why this hasn't been merged?
I believe you have to be logged in now anyways so this is invalid
dcramer
closed this
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This page is out of date. Refresh to see the latest.
Showing 2 changed files with 10 additions and 5 deletions. Show Diff Stats
@@ -34,10 +34,13 @@ |
||
| 34 | 34 |
{% block sidebar %}
|
| 35 | 35 |
{% querystring from request without bookmarks as bookmark_querystring %}
|
| 36 | 36 |
<h6>{% trans "Bookmarks" %}</h6>
|
| 37 |
- <form> |
|
| 38 | 37 |
<ul class="nav nav-tabs nav-stacked filter-list"> |
| 38 |
+ {% if request.user.is_anonymous %}
|
|
| 39 |
+ <li class="active"><a href="?">{% trans "All Events" %}</a></li>
|
|
| 40 |
+ {% else %}
|
|
| 39 | 41 |
<li{% if not request.GET.bookmarks %} class="active"{% endif %}><a href="?{{ bookmark_querystring }}">{% trans "All Events" %}</a></li>
|
| 40 | 42 |
<li{% if request.GET.bookmarks %} class="active"{% endif %}><a href="?{{ bookmark_querystring }}&bookmarks=1">{% trans "Only Bookmarks" %}</a></li>
|
| 43 |
+ {% endif %}
|
|
| 41 | 44 |
</ul> |
| 42 | 45 |
|
| 43 | 46 |
{% for filter in filters %}
|
@@ -58,10 +58,12 @@ def _get_group_list(request, project, view=None): |
||
| 58 | 58 |
|
| 59 | 59 |
event_list = Group.objects |
| 60 | 60 |
if request.GET.get('bookmarks'):
|
| 61 |
- event_list = event_list.filter( |
|
| 62 |
- bookmark_set__project=project, |
|
| 63 |
- bookmark_set__user=request.user, |
|
| 64 |
- ) |
|
| 61 |
+ # Ignore this filter if anon user |
|
| 62 |
+ if not request.user.is_anonymous(): |
|
| 63 |
+ event_list = event_list.filter( |
|
| 64 |
+ bookmark_set__project=project, |
|
| 65 |
+ bookmark_set__user=request.user, |
|
| 66 |
+ ) |
|
| 65 | 67 |
else: |
| 66 | 68 |
event_list = event_list.filter(project=project) |
| 67 | 69 |
|
Tip: You can add notes to lines in a file. Hover to the left of a line to make a note
Attempting to filter by bookmarks when not logged in currently fails hard (see #398)
This patch removes the "Only Bookmarks" link from the sidebar, and ignores
?bookmarks=1if the user is anonymous.I'm not convinced removing the link makes for a good UX. Perhaps disabling it in some way is a better option. Let me know what you guys prefer and I'll modify accordingly.