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

Adapt Delete room to work with several ogServers 

This commit makes Delete room view to use ogServer field from scopesForm
to send the command to the correct ogServer.
async-tree
Javier Sánchez Parra 2022-08-23 17:21:22 +02:00
parent f009a188b1
commit 3d42c2c66c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ogcp/forms/action_forms.py
View File

@ -176,6 +176,7 @@ class RoomForm(FlaskForm):
submit = SubmitField(label=_l('Submit'))
class DeleteRoomForm(FlaskForm):
server = HiddenField()
room = SelectField(label=_l('Room'),
validators=[InputRequired()])
submit = SubmitField(label=_l('Submit'))

7
ogcp/views.py
View File

@ -1328,7 +1328,8 @@ def action_room_delete():
form = DeleteRoomForm(request.form)
if request.method == 'POST':
payload = {"id": form.room.data}
r = g.server.post('/room/delete', payload)
server = get_server_from_ip_port(form.server.data)
r = server.post('/room/delete', payload)
if r.status_code != requests.codes.ok:
flash(_('Server replied with error code when deleting the room'),
category='error')
@ -1340,13 +1341,15 @@ def action_room_delete():
if not params.get('scope-room'):
flash(_('Please, select one room'), category='error')
return redirect(url_for('scopes'))
r = g.server.get('/scopes')
server = get_server_from_ip_port(params['scope-server'])
r = server.get('/scopes')
rooms = parse_scopes_from_tree(r.json(), 'room')
selected_room_id = params['scope-room']
selected_room = [(room['id'], room['name'] + " (" + room['parent'] + ")")
for room in rooms if room['id'] == int(selected_room_id)]
form.room.choices = selected_room
form.room.render_kw = {'readonly': True}
form.server.data = params['scope-server']
scopes, clients = get_scopes()
return render_template('actions/delete_room.html', form=form,
scopes=scopes)