JohnHammond
/
ColdCore
mirror of https://github.com/JohnHammond/ColdCore.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

..fix tickets more

master
James Sigurðarson 2016-08-12 14:51:31 +01:00
parent 02e3b73a8f
commit 18a21e628a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
routes/tickets.py
View File

@ -33,41 +33,41 @@ def open_ticket():
return redirect(url_for(".detail", ticket=t.id))
@tickets.route('/tickets/<int:ticket>/')
@tickets.route('/tickets/<int:ticket_id>/')
@decorators.must_be_allowed_to("view tickets")
@decorators.login_required
def detail(ticket):
def detail(ticket_id):
try:
ticket = ticket.get_ticket(g.team, ticket)
t = ticket.get_ticket(g.team, ticket_id)
except exceptions.ValidationError as e:
flash(str(e))
return redirect(url_for(".index"))
comments = ticket.get_comments(ticket)
return render_template("ticket_detail.html", ticket=ticket, comments=comments)
comments = ticket.get_comments(t)
return render_template("ticket_detail.html", ticket=t, comments=comments)
@tickets.route('/tickets/<int:ticket>/comment/', methods=["POST"])
@tickets.route('/tickets/<int:ticket_id>/comment/', methods=["POST"])
@decorators.must_be_allowed_to("comment on tickets")
@decorators.must_be_allowed_to("view tickets")
@ratelimit.ratelimit(limit=1, per=120)
def comment(ticket):
def comment(ticket_id):
try:
ticket = ticket.get_ticket(g.team, ticket)
t = ticket.get_ticket(g.team, ticket_id)
except exceptions.ValidationError as e:
flash(str(e))
return redirect(url_for(".index"))
if request.form["comment"]:
ticket.create_comment(ticket, g.user, request.form["comment"])
ticket.create_comment(t, g.user, request.form["comment"])
flash("Comment added.")
if ticket.active and "resolved" in request.form:
ticket.close_ticket(ticket)
ticket.close_ticket(t)
flash("Ticket closed.")
elif not ticket.active and "resolved" not in request.form:
ticket.open_ticket(ticket)
ticket.open_ticket(t)
flash("Ticket re-opened.")
return redirect(url_for(".detail", ticket=ticket.id))
return redirect(url_for(".detail", ticket=t.id))