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

Adapt Delete image to work with several ogServers 

This commit makes Delete image view to use ogServer field from
imagesForm to send the deletion request to the correct ogServer.
async-tree
Javier Sánchez Parra 2022-08-30 17:04:25 +02:00
parent 70eb7389bb
commit 083caf00c6
2 changed files with 8 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

@ -18,6 +18,7 @@ from flask_babel import _
class GenericForm(FlaskForm):
ips = HiddenField()
ids = HiddenField()
server = HiddenField()
submit = SubmitField(label=_l('Submit'))

9
ogcp/views.py
View File

@ -1661,19 +1661,24 @@ def action_image_delete():
return redirect(url_for('images'))
id = ids.pop()
payload = {'image': id}
r = g.server.post('/image/delete', payload)
server = get_server_from_ip_port(form.server.data)
r = server.post('/image/delete', payload)
if r.status_code != requests.codes.ok:
flash(_('OgServer replied with a non ok status code'), category='error')
else:
flash(_('Image deletion request sent successfully'), category='info')
return redirect(url_for('images'))
else:
images = [(name, imgid) for name, imgid in request.args.to_dict().items() if name != "csrf_token"]
params = request.args.to_dict()
images = [(name, imgid) for name, imgid in params.items()
if name != 'csrf_token' and name != 'image-server']
if not validate_elements(images, max_len=1):
return redirect(url_for('images'))
image_name, image_id = images[0]
server = get_server_from_ip_port(params['image-server'])
responses = multi_request('get', '/images')
form.ids.data = image_id
form.server.data = params['image-server']
if not validate_elements(images, max_len=1):
flash(_('Please select one image to delete'), category='error')
return redirect(url_for('images'))