sourcehut
/
todo.sr.ht
mirror of https://git.sr.ht/~sircmpwn/todo.sr.ht
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix enable/disable notifications

This commit is contained in:
Drew DeVault 2019-08-23 08:55:08 +09:00
parent d4d61d2792
commit b46f03ea64
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
todosrht/blueprints/ticket.py
View File

@ -83,16 +83,16 @@ def enable_notifications(owner, name, ticket_id):
if not ticket:
abort(404)
participant = get_participant_for_user(current_user)
sub = (TicketSubscription.query
.filter(TicketSubscription.tracker_id == None)
.filter(TicketSubscription.ticket_id == ticket.id)
.filter(TicketSubscription.user_id == current_user.id)
.filter(TicketSubscription.participant_id == participant.id)
).one_or_none()
if sub:
return redirect(ticket_url(ticket))
participant = get_participant_for_user(current_user)
sub = TicketSubscription()
sub.ticket_id = ticket.id
sub.participant_id = participant.id
@ -110,10 +110,11 @@ def disable_notifications(owner, name, ticket_id):
if not ticket:
abort(404)
participant = get_participant_for_user(current_user)
sub = (TicketSubscription.query
.filter(TicketSubscription.tracker_id == None)
.filter(TicketSubscription.ticket_id == ticket.id)
.filter(TicketSubscription.user_id == current_user.id)
.filter(TicketSubscription.participant_id == participant.id)
).one_or_none()
if not sub:

6
todosrht/blueprints/tracker.py
View File

@ -115,10 +115,11 @@ def enable_notifications(owner, name):
if not tracker:
abort(404)
participant = get_participant_by_user(current_user)
sub = (TicketSubscription.query
.filter(TicketSubscription.tracker_id == tracker.id)
.filter(TicketSubscription.ticket_id == None)
.filter(TicketSubscription.user_id == current_user.id)
.filter(TicketSubscription.participant_id == participant.id)
).one_or_none()
if sub:
@ -139,10 +140,11 @@ def disable_notifications(owner, name):
if not tracker:
abort(404)
participant = get_participant_by_user(current_user)
sub = (TicketSubscription.query
.filter(TicketSubscription.tracker_id == tracker.id)
.filter(TicketSubscription.ticket_id == None)
.filter(TicketSubscription.user_id == current_user.id)
.filter(TicketSubscription.participant_id == participant.id)
).one_or_none()
if not sub: