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

Simplify ticket_GET view 

is_subscribed renamed to ticket_sub to be in line with existing
tracker_sub.
This commit is contained in:
Ivan Habunek 2018-11-27 10:01:38 +01:00 committed by Drew DeVault
parent 2376114ee8
commit 7bdd29ebae
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
todosrht/blueprints/ticket.py
View File

@ -14,6 +14,7 @@ from todosrht.urls import ticket_url
ticket = Blueprint("ticket", __name__)
@ticket.route("/<owner>/<name>/<int:ticket_id>")
def ticket_GET(owner, name, ticket_id):
tracker, _ = get_tracker(owner, name)
@ -22,28 +23,22 @@ def ticket_GET(owner, name, ticket_id):
ticket, access = get_ticket(tracker, ticket_id)
if not ticket:
abort(404)
is_subscribed = False
tracker_sub = None
ticket_sub = None
if current_user:
mark_seen(ticket, current_user)
db.session.commit()
tracker_sub = (TicketSubscription.query
.filter(TicketSubscription.ticket_id == None)
.filter(TicketSubscription.tracker_id == tracker.id)
.filter(TicketSubscription.user_id == current_user.id)
).one_or_none()
tracker_sub = TicketSubscription.query.filter_by(
ticket=None, tracker=tracker, user=current_user).one_or_none()
sub = (TicketSubscription.query
.filter(TicketSubscription.tracker_id == None)
.filter(TicketSubscription.ticket_id == ticket.id)
.filter(TicketSubscription.user_id == current_user.id)
).one_or_none()
is_subscribed = bool(sub)
ticket_sub = TicketSubscription.query.filter_by(
ticket=ticket, tracker=None, user=current_user).one_or_none()
return render_template("ticket.html", tracker=tracker, ticket=ticket,
access=access, is_subscribed=is_subscribed, tracker_sub=tracker_sub)
access=access, ticket_sub=ticket_sub, tracker_sub=tracker_sub)
@ticket.route("/<owner>/<name>/<int:ticket_id>/enable_notifications", methods=["POST"])
@loginrequired

4
todosrht/templates/ticket.html
View File

@ -45,7 +45,7 @@
<li class="nav-item d-none d-sm-block">
{% if not tracker_sub %}
<form method="POST" action="{{url_for("ticket." +
("disable_notifications" if is_subscribed else "enable_notifications"),
("disable_notifications" if ticket_sub else "enable_notifications"),
owner=tracker.owner.canonical_name(),
name=tracker.name,
ticket_id=ticket.scoped_id)}}">
@ -63,7 +63,7 @@
{% endif %}
>
{{icon("envelope-o")}}
{% if is_subscribed or tracker_sub %}
{% if ticket_sub or tracker_sub %}
Disable notifications
{% else %}
Enable notifications