summaryrefslogtreecommitdiffstats
path: root/ogcp/views.py
diff options
context:
space:
mode:
authorJavier Sánchez Parra <jsanchez@soleta.eu>2022-08-24 12:43:01 +0200
committerJavier Sánchez Parra <jsanchez@soleta.eu>2022-09-27 09:48:35 +0200
commit873bee30aa9c6385420741fb23615cf5d20daffb (patch)
tree913553fdc710f957fb1f63e206371b1a11a3fc70 /ogcp/views.py
parent43d2df0e7d02a145f4d0b491637367b1a74d2619 (diff)
Adapt Delete center to work with several ogServers
This commit makes Delete center view to use ogServer field from scopesForm to send the command to the correct ogServer.
Diffstat (limited to 'ogcp/views.py')
-rw-r--r--ogcp/views.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ogcp/views.py b/ogcp/views.py
index 2327b19..316bcf1 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -1276,8 +1276,9 @@ def action_center_add():
def action_center_delete():
form = DeleteCenterForm(request.form)
if request.method == 'POST':
+ server = get_server_from_ip_port(form.server.data)
payload = {"id": form.center.data}
- r = g.server.post('/center/delete', payload)
+ r = server.post('/center/delete', payload)
if r.status_code != requests.codes.ok:
flash(_('Server replied with error code when deleting the center'),
category='error')
@@ -1289,13 +1290,15 @@ def action_center_delete():
if not params.get('scope-center'):
flash(_('Please, select one center'), 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')
selected_center_id = params['scope-center']
centers = parse_scopes_from_tree(r.json(), 'center')
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}
+ form.server.data = params['scope-server']
scopes, clients = get_scopes()
return render_template('actions/delete_center.html', form=form,
scopes=scopes)