diff options
Diffstat (limited to 'ogcp')
| -rw-r--r-- | ogcp/templates/actions/delete_client.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/image_restore.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/mode.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/oglive.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/poweroff.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/reboot.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/session.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/actions/wol.html | 2 | ||||
| -rw-r--r-- | ogcp/templates/macros.html | 18 | ||||
| -rw-r--r-- | ogcp/views.py | 35 |
10 files changed, 51 insertions, 18 deletions
diff --git a/ogcp/templates/actions/delete_client.html b/ogcp/templates/actions/delete_client.html index ea46b4f..7a144b5 100644 --- a/ogcp/templates/actions/delete_client.html +++ b/ogcp/templates/actions/delete_client.html @@ -10,7 +10,7 @@ {{ _('Delete %(ip_count)d client(s)', ip_count=ip_count) }} </h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_client_delete'), diff --git a/ogcp/templates/actions/image_restore.html b/ogcp/templates/actions/image_restore.html index 9bd368b..c8322e8 100644 --- a/ogcp/templates/actions/image_restore.html +++ b/ogcp/templates/actions/image_restore.html @@ -8,7 +8,7 @@ {% set ip_count = ip_list | length %} <h1 class="m-5">Restore partition image to {{ip_count}} {%if ip_count > 1%}computers{% else %}computer{% endif %}</h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_image_restore'), diff --git a/ogcp/templates/actions/mode.html b/ogcp/templates/actions/mode.html index 63f3d8f..7e7f39e 100644 --- a/ogcp/templates/actions/mode.html +++ b/ogcp/templates/actions/mode.html @@ -8,7 +8,7 @@ {% set ip_count = ip_list | length %} <h1 class="m-5">Changing boot mode of {{ip_count}} {%if ip_count > 1%}computers{% else %}computer{% endif %}</h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_mode'), diff --git a/ogcp/templates/actions/oglive.html b/ogcp/templates/actions/oglive.html index ea85d00..92c8687 100644 --- a/ogcp/templates/actions/oglive.html +++ b/ogcp/templates/actions/oglive.html @@ -8,7 +8,7 @@ {% set ip_count = ip_list | length %} <h1 class="m-5">Changing ogLive of {{ip_count}} {%if ip_count > 1%}computers{% else %}computer{% endif %}</h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_oglive'), diff --git a/ogcp/templates/actions/poweroff.html b/ogcp/templates/actions/poweroff.html index 11b14d8..cc739d3 100644 --- a/ogcp/templates/actions/poweroff.html +++ b/ogcp/templates/actions/poweroff.html @@ -10,7 +10,7 @@ {{ _('Power off %(ip_count)d client(s)', ip_count=ip_count) }} </h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_poweroff'), diff --git a/ogcp/templates/actions/reboot.html b/ogcp/templates/actions/reboot.html index 2b4cba6..9a6a1bc 100644 --- a/ogcp/templates/actions/reboot.html +++ b/ogcp/templates/actions/reboot.html @@ -10,7 +10,7 @@ {{ _('Reboot %(ip_count)d client(s)', ip_count=ip_count) }} </h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_reboot'), diff --git a/ogcp/templates/actions/session.html b/ogcp/templates/actions/session.html index fab5bcf..189ceb4 100644 --- a/ogcp/templates/actions/session.html +++ b/ogcp/templates/actions/session.html @@ -9,7 +9,7 @@ {{ _('Start %(ip_count)d client(s) session', ip_count=ip_count) }} </h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_session'), diff --git a/ogcp/templates/actions/wol.html b/ogcp/templates/actions/wol.html index 2a35592..7ba014c 100644 --- a/ogcp/templates/actions/wol.html +++ b/ogcp/templates/actions/wol.html @@ -8,7 +8,7 @@ {% set ip_count = ip_list | length %} <h1 class="m-5">Powering on {{ip_count}} {%if ip_count > 1%}computers{% else %}computer{% endif %}</h1> -{{ macros.cmd_selected_clients(ip_list) }} +{{ macros.cmd_selected_clients(selected_clients) }} {{ wtf.quick_form(form, action=url_for('action_wol'), diff --git a/ogcp/templates/macros.html b/ogcp/templates/macros.html index 6999fd6..745b154 100644 --- a/ogcp/templates/macros.html +++ b/ogcp/templates/macros.html @@ -53,14 +53,16 @@ <div id="selected-clients" class="d-flex flex-wrap justify-content-center"></div> {% endmacro %} -{% macro cmd_selected_clients(ip_list) -%} -<ul class="list-group mx-5 list-group-horizontal-sm d-flex flex-wrap"> -{% set max_clients = 50 %} -{% for ip in ip_list[:max_clients] %} - <li class="list-group-item flex-fill list-group-item-info">{{ ip }}</li> - {% if loop.last %} - <li class="list-group-item flex-fill list-group-item-info">...</li> +{% macro cmd_selected_clients(selected_clients) -%} +<div class="d-flex flex-wrap justify-content-center"> + {% set max_clients = 50 %} + {% for name_id, ip in selected_clients[:max_clients] %} + <div id="pill-{{ name_id|replace(".", "_") }}" class="badge badge-pill badge-light"> + {{ name_id }}<br>{{ ip }} + </div> + {% if loop.last and (selected_clients|length > max_clients) %} + <div class="badge badge-pill badge-light">...</div> {% endif %} {% endfor %} -</ul> +</div> {% endmacro %} diff --git a/ogcp/views.py b/ogcp/views.py index 54c1438..c993350 100644 --- a/ogcp/views.py +++ b/ogcp/views.py @@ -277,7 +277,9 @@ def action_poweroff(): form.ips.data = " ".join(ips) if validate_elements(ips): scopes, clients = get_scopes(set(ips)) + selected_clients = list(get_selected_clients(scopes['scope']).items()) return render_template('actions/poweroff.html', form=form, + selected_clients=selected_clients, scopes=scopes) else: return redirect(url_for('commands')) @@ -299,7 +301,9 @@ def action_wol(): form.ips.data = " ".join(ips) if validate_elements(ips, min_len=1): scopes, clients = get_scopes(set(ips)) + selected_clients = list(get_selected_clients(scopes['scope']).items()) return render_template('actions/wol.html', form=form, + selected_clients=selected_clients, scopes=scopes) else: return redirect(url_for('commands')) @@ -470,8 +474,10 @@ def action_image_restore(): for disk_id, part_id in part_choices ] scopes, clients = get_scopes(set(ips)) + selected_clients = list(get_selected_clients(scopes['scope']).items()) return render_template('actions/image_restore.html', form=form, + selected_clients=selected_clients, scopes=scopes) @app.route('/action/hardware', methods=['GET', 'POST']) @@ -569,7 +575,9 @@ def action_session(): f"{os['name']} ({os['disk']},{os['partition']})") form.os.choices.append(choice) scopes, clients = get_scopes(set(ips)) + selected_clients = list(get_selected_clients(scopes['scope']).items()) return render_template('actions/session.html', form=form, + selected_clients=selected_clients, scopes=scopes) @app.route('/action/client/info', methods=['GET']) @@ -673,6 +681,20 @@ def action_client_add(): form.create.render_kw = {"formaction": url_for('action_client_add')} return render_template('actions/client_details.html', form=form) +def get_selected_clients(scopes): + selected_clients = dict() + + for scope in scopes: + scope_type = scope.get('type') + selected = scope.get('selected') + if ((scope_type == 'computer') and selected): + name_id = scope.get('name') + '_' + str(scope.get('id')) + selected_clients[name_id] = scope.get('ip')[0] + else: + selected_clients.update(get_selected_clients(scope['scope'])) + + return selected_clients + @app.route('/action/client/delete', methods=['GET', 'POST']) @login_required def action_client_delete(): @@ -696,7 +718,9 @@ def action_client_delete(): form.ips.data = " ".join(ips) if validate_elements(ips): scopes, clients = get_scopes(set(ips)) + selected_clients = list(get_selected_clients(scopes['scope']).items()) return render_template('actions/delete_client.html', form=form, + selected_clients=selected_clients, scopes=scopes) else: return redirect(url_for('scopes')) @@ -728,7 +752,10 @@ def action_mode(): form.ok.render_kw = { 'formaction': url_for('action_mode') } scopes, clients = get_scopes(set(ips)) - return render_template('actions/mode.html', form=form, scopes=scopes, clients=clients) + selected_clients = list(get_selected_clients(scopes['scope']).items()) + return render_template('actions/mode.html', form=form, scopes=scopes, + selected_clients=selected_clients, + clients=clients) @app.route('/action/oglive', methods=['GET', 'POST']) @@ -765,7 +792,9 @@ def action_oglive(): form.ok.render_kw = {'formaction': url_for('action_oglive')} scopes, clients = get_scopes(set(ips)) - return render_template('actions/oglive.html', form=form, scopes=scopes) + selected_clients = list(get_selected_clients(scopes['scope']).items()) + return render_template('actions/oglive.html', form=form, scopes=scopes, + selected_clients=selected_clients) @app.route('/action/image/create', methods=['GET', 'POST']) @@ -839,7 +868,9 @@ def action_reboot(): form.ips.data = " ".join(ips) if validate_elements(ips): scopes, clients = get_scopes(set(ips)) + selected_clients = list(get_selected_clients(scopes['scope']).items()) return render_template('actions/reboot.html', form=form, + selected_clients=selected_clients, scopes=scopes) else: return redirect(url_for('commands')) |