diff --git a/transporte/views.py b/transporte/views.py index ba20f4f5518237711077495286a4fbb61d1ca422..214b17f8500e7c65ceaecca5233c1983b32e192e 100644 --- a/transporte/views.py +++ b/transporte/views.py @@ -195,6 +195,7 @@ def list_transports(): return render_template('transport_list.html', transportlist=transportlist, filterform=filterform) +@app.route('/transports/sticker/<int:id>', endpoint="sticker_transport") @app.route('/transports/show/<int:id>') @login_required def show_transport(id=None): @@ -210,24 +211,11 @@ def show_transport(id=None): elif transport.cancelled: flash('Transport was cancelled!', 'danger') - return render_template('transport_details.html', transport=transport) - - -@app.route('/transports/sticker/<int:id>') -@login_required -def sticker_transport(id=None): - transport = Transport.query.get(id) - if transport is None or not ( - transport.user_id == current_user.id or current_user.role in ['helpdesk', 'admin']): - transport = None - flash('Transport is not available') + if '/sticker/' in request.path: + template = 'transport_sticker.html' else: - if transport.done: - flash('Transport is done', 'success') - elif transport.cancelled: - flash('Transport was cancelled!', 'danger') - - return render_template('transport_sticker.html', transport=transport) + template = 'transport_details.html' + return render_template(template, transport=transport) @app.route('/transports/mark/<mark>/<int:id>', methods=['GET', 'POST'])