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

Add a room to a center using the scopes tree 

With this commit users can select a center from the scopes tree, and then
add a room to that center.
async-tree
Javier Sánchez Parra 2022-08-23 16:15:23 +02:00
parent 0db56d5eee
commit 0cc65a057d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ogcp/templates/macros.html
View File

@ -28,6 +28,12 @@
value="{{ scope["server_ip_port"] }}" onclick="return false;"
{% if scope.get("selected", False) %}checked{% endif %}
name="scope-server" hidden/>
{% elif scope["type"] == "center" %}
<input class="form-check-input" type="checkbox" form="scopesForm"
value="{{ scope["id"] }}"
{% if state %}style="filter: grayscale(100%);" onclick="return false;"{% endif %}
{% if scope.get("selected", False) %}checked{% endif %}
name="scope-center" />
{% elif scope["type"] == "room" %}
<input class="form-check-input" type="checkbox" form="scopesForm"
value="{{ scope["id"] }}"

14
ogcp/views.py
View File

@ -96,7 +96,8 @@ def validate_elements(elements, min_len=1, max_len=float('inf')):
return valid
def parse_elements(checkboxes_dict):
unwanted_elements = ['csrf_token', 'scope-server', 'scope-room']
unwanted_elements = ['csrf_token', 'scope-server', 'scope-center',
'scope-room']
elements = set()
for key, elements_list in checkboxes_dict.items():
if key not in unwanted_elements:
@ -1303,10 +1304,17 @@ def action_room_add():
flash(_('Room added successfully'), category='info')
return redirect(url_for("scopes"))
else:
params = request.args.to_dict()
if not params.get('scope-center'):
flash(_('Please, select one center'), category='error')
return redirect(url_for('scopes'))
r = g.server.get('/scopes')
selected_center_id = params['scope-center']
centers = parse_scopes_from_tree(r.json(), 'center')
centers = [(center['id'], center['name']) for center in centers]
form.center.choices = list(centers)
selected_center = [(center['id'], center['name']) for center in centers
if center['id'] == int(selected_center_id)]
form.center.choices = selected_center
form.center.render_kw = {'readonly': True}
scopes, clients = get_scopes()
return render_template('actions/add_room.html', form=form,
scopes=scopes)