48k.eu-mirror
/
ogcp
mirror of https://git.48k.eu/ogcp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip make tree async parte 2 

Estos cambio eran necesarios porque si no había elementos del html con
el mismo id y esto provoca que se rompa parte del javascript.
async-tree
Javier Sánchez Parra 2022-10-26 14:01:45 +02:00
parent 20935966ef
commit 285dfb6eac
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ogcp/templates/macros.html
View File

@ -23,9 +23,9 @@
{% endmacro %}
{% macro scopes_tree_collapse_level(scopes, parent_room, parent_id, state, selection_mode) -%}
{% macro scopes_tree_collapse_level(scopes, parent_server, parent_room, parent_id, state, selection_mode) -%}
{% for scope in scopes %}
<li id="{{ scope["name"]|replace(".", "_")|replace(" ", "_") }}_{{ scope["id"] }}" class="nav-item">
<li id="{{ parent_server }}_{{ scope["name"]|replace(".", "_")|replace(" ", "_") }}_{{ scope["id"] }}" class="nav-item">
{% if scope["type"] == "server" %}
<input class="form-check-input" type="checkbox" form="scopesForm"
value="{{ scope["server_ip_port"] }}" onclick="return false;"
@ -53,7 +53,7 @@
{% if scope.get("selected", False) %}checked{% endif %}
name="{{ scope["name"] }}_{{ scope["id"] }}" />
{% endif %}
<a class="nav-link {% if not scope["scope"] %}disabled{% endif %}" href="#scope{{parent_id ~ "-" ~ loop.index}}"
<a class="nav-link {% if not scope["scope"] %}disabled{% endif %}" href="#{{parent_server ~ parent_id ~ "-" ~ loop.index}}"
{% if scope["scope"] %}data-toggle="collapse"{% endif %}>
{% if "state" in scope %}
<i class="nav-icon fa-circle
@ -70,8 +70,8 @@
{{ scope["name"] }}
</a>
{% if scope["scope"] %}
<ul class="nav flex-column collapse level{{i}}" id="scope{{parent_id ~ "-" ~ loop.index}}">
{{ scopes_tree_collapse_level(scope["scope"], parent_room, parent_id ~ "-" ~ loop.index, state, selection_mode) }}
<ul class="nav flex-column collapse level{{i}}" id="{{parent_server ~ parent_id ~ "-" ~ loop.index}}">
{{ scopes_tree_collapse_level(scope["scope"], parent_server, parent_room, parent_id ~ "-" ~ loop.index, state, selection_mode) }}
</ul>
{% endif %}
</li>

2
ogcp/templates/tree.html
View File

@ -1,2 +1,2 @@
{% import "macros.html" as macros %}
{{ macros.scopes_tree_collapse_level(scopes["scope"], '', '', '', 'scopes') }}
{{ macros.scopes_tree_collapse_level(scopes["scope"], parent_server, '', '', '', 'scopes') }}

3
ogcp/views.py
View File

@ -445,7 +445,8 @@ def scopes_tree():
params = request.args.to_dict()
server = get_server_from_ip_port(params['server'])
scopes = get_scopes_from_server(server)
return render_template('tree.html', scopes=scopes)
return render_template('tree.html', scopes=scopes,
parent_server=server.name)
@app.route('/scopes/')