diff --git a/apps/abs/views.py b/apps/abs/views.py index 89313c8..4270707 100644 --- a/apps/abs/views.py +++ b/apps/abs/views.py @@ -264,20 +264,33 @@ def send_beam(request, id_conf, id_beam): return redirect(conf.get_absolute_url()) beam = get_object_or_404(ABSBeam, pk=id_beam) - beams_list = ABSBeam.objects.filter(abs_conf=conf) - conf.active_beam = id_beam - i = 0 - for b in beams_list: - if b.id == int(id_beam): - break - else: - i += 1 - beam_pos = i + 1 #Estandarizar - print '%s Position: %s' % (beam.name, str(beam_pos)) - conf.send_beam(beam_pos) + if request.method == 'POST': + + beams_list = ABSBeam.objects.filter(abs_conf=conf) + conf.active_beam = id_beam + + i = 0 + for b in beams_list: + if b.id == int(id_beam): + break + else: + i += 1 + beam_pos = i + 1 #Estandarizar + print '%s Position: %s' % (beam.name, str(beam_pos)) + conf.send_beam(beam_pos) + + return redirect('url_abs_conf', conf.id) + + kwargs = { + 'title': 'ABS', + 'suptitle': conf.label, + 'message': 'Are you sure you want to change ABS Beam to: {}?'.format(beam.name), + 'delete': False + } + kwargs['menu_configurations'] = 'active' - return redirect('url_abs_conf', conf.id) + return render(request, 'confirm.html', kwargs) def add_beam(request, id_conf): diff --git a/apps/main/views.py b/apps/main/views.py index 62dc6bb..1cb07b9 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -1492,16 +1492,27 @@ def dev_conf_write(request, id_conf): conf = get_object_or_404(Configuration, pk=id_conf) - if conf.write_device(): - conf.device.conf_active = conf.pk - conf.device.save() - messages.success(request, conf.message) - if has_been_modified(conf): - conf.clone(type=1, template=False) - else: - messages.error(request, conf.message) + if request.method == 'POST': + if conf.write_device(): + conf.device.conf_active = conf.pk + conf.device.save() + messages.success(request, conf.message) + if has_been_modified(conf): + conf.clone(type=1, template=False) + else: + messages.error(request, conf.message) - return redirect(get_object_or_404(Configuration, pk=id_conf).get_absolute_url()) + return redirect(get_object_or_404(Configuration, pk=id_conf).get_absolute_url()) + + kwargs = { + 'title': 'Write Configuration', + 'suptitle': conf.label, + 'message': 'Are you sure yo want to write this {} configuration?'.format(conf.device), + 'delete': False + } + kwargs['menu_configurations'] = 'active' + + return render(request, 'confirm.html', kwargs) @login_required