DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #485 from sgmap/fix-396

Browse source 
[Fix #396] Don’t submit the publish form after a transfer
This commit is contained in:
gregoirenovel 2017-06-26 10:51:42 +02:00 committed by GitHub
commit 859a821ee7
3 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/procedures_controller.rb
View file

@ -123,18 +123,20 @@ class Admin::ProceduresController < AdminController
def transfer def transfer
admin = Administrateur.find_by_email(params[:email_admin]) admin = Administrateur.find_by_email(params[:email_admin])
return render '/admin/procedures/transfer', formats: 'js', status: 404 if admin.nil? if admin.nil?
render '/admin/procedures/transfer', formats: 'js', status: 404
else
procedure = current_administrateur.procedures.find(params[:procedure_id]) procedure = current_administrateur.procedures.find(params[:procedure_id])
clone_procedure = procedure.clone clone_procedure = procedure.clone
clone_procedure.administrateur = admin clone_procedure.administrateur = admin
clone_procedure.save clone_procedure.save
flash.now.notice = "La procédure a correctement été cloné vers le nouvel administrateur." flash.now.notice = "La procédure a correctement été clonée vers le nouvel administrateur."
render '/admin/procedures/transfer', formats: 'js', status: 200 render '/admin/procedures/transfer', formats: 'js', status: 200
end end
end
def archive def archive
procedure = current_administrateur.procedures.find(params[:procedure_id]) procedure = current_administrateur.procedures.find(params[:procedure_id])

7
app/views/admin/procedures/_modal_transfer.html.haml
View file

@ -5,18 +5,23 @@
.modal-header .modal-header
%button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" } %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
%span{ "aria-hidden" => "true" } × %span{ "aria-hidden" => "true" } ×
%h4#myModalLabel.modal-title %h4#myModalLabel.modal-title
Petit transfert de procédure entre administrateur Transférer la procédure à un autre administrateur
.modal-body .modal-body
%p %p
Cette fonctionnalité vous permet de transmettre un clone de votre procédure à un autre administrateur. Cette fonctionnalité vous permet de transmettre un clone de votre procédure à un autre administrateur.
%div{ style:'margin-top:20px' } %div{ style:'margin-top:20px' }
= text_field_tag :email_admin, '', { class: 'form-control', = text_field_tag :email_admin, '', { class: 'form-control',
type: 'email', type: 'email',
placeholder: 'Email administrateur cible', placeholder: 'Email administrateur cible',
style: 'width: 300px; margin-left:auto; margin-right:auto' } style: 'width: 300px; margin-left:auto; margin-right:auto' }
#not_found_admin.center.text-danger{ style:'display: none; margin-top: 10px;' } #not_found_admin.center.text-danger{ style:'display: none; margin-top: 10px;' }
Cet administrateur n'existe pas. Cet administrateur n'existe pas.
.modal-footer .modal-footer
= submit_tag "Envoyer", class: 'btn btn-success' = submit_tag "Envoyer", class: 'btn btn-success'
= button_tag 'Annuler', class: %w(btn btn btn-default), id: 'cancel', data: { dismiss: 'modal' } = button_tag 'Annuler', class: %w(btn btn btn-default), id: 'cancel', data: { dismiss: 'modal' }

9
app/views/admin/procedures/transfer.js.erb
View file

@ -1,11 +1,12 @@
<%- if response.status == 404 %> <%- if response.status == 404 %>
transfer_errors_message(true); transfer_errors_message(true);
<%- else %> <%- else %>
<% flash.each do |type, message| %> $("#main-container").prepend("<div class='row'><div id='flash_message'></div></div>");
$("#flash_message").html("<div class=\"alert alert-success\"> <%= message.html_safe %></div>") $("#flash_message").prepend("<div class=\"alert alert-success\"> <%= flash.notice.html_safe %></div>");
<% end %>
<% flash.clear %> <% flash.clear %>
transfer_errors_message(false); transfer_errors_message(false);
$("#email_admin").val(''); $("#email_admin").val('');
$("button#cancel").click();
$("#transferModal button#cancel").click();
<%- end %> <%- end %>