From 4005b019ee013c223a6ca3b31dd8fb7799c838d1 Mon Sep 17 00:00:00 2001 From: Javier Sánchez Parra Date: Thu, 3 Mar 2022 11:11:23 +0100 Subject: Extend scopes or commands in client details Both "Add client" and "Client details" views use client_details.html template. With this commit, "Add client" extends scopes.html and "Client details" extend commands.hmlt. --- ogcp/templates/actions/client_details.html | 2 +- ogcp/views.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ogcp/templates/actions/client_details.html b/ogcp/templates/actions/client_details.html index 34dea36..102f333 100644 --- a/ogcp/templates/actions/client_details.html +++ b/ogcp/templates/actions/client_details.html @@ -1,4 +1,4 @@ -{% extends 'commands.html' %} +{% extends parent %} {% import "bootstrap/wtf.html" as wtf %} {% block content %} diff --git a/ogcp/views.py b/ogcp/views.py index c993350..d4c74a1 100644 --- a/ogcp/views.py +++ b/ogcp/views.py @@ -640,7 +640,7 @@ def action_client_info(): scopes, clients = get_scopes(set(ips)) return render_template('actions/client_details.html', form=form, - scopes=scopes, setup=setup) + parent="commands.html", scopes=scopes, setup=setup) @app.route('/action/client/add', methods=['GET', 'POST']) @login_required @@ -679,7 +679,9 @@ def action_client_add(): form.room.choices = list(rooms) form.create.render_kw = {"formaction": url_for('action_client_add')} - return render_template('actions/client_details.html', form=form) + scopes, clients = get_scopes() + return render_template('actions/client_details.html', form=form, + parent="scopes.html", scopes=scopes) def get_selected_clients(scopes): selected_clients = dict() -- cgit v1.2.3-18-g5258