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

Rename Procedure#archived? -> #archivee?

Browse source
This commit is contained in:
gregoirenovel 2017-07-13 15:09:25 +02:00
parent 07d390db09
commit cfec05506a
11 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/procedures/_list.html.haml
View file

@ -20,7 +20,7 @@
= procedure.created_at_fr
%td
= link_to('Cloner', admin_procedure_clone_path(procedure.id), 'data-method' => :put, class: 'btn-sm btn-primary clone-btn')
- unless procedure.published? || procedure.archived?
- unless procedure.published? || procedure.archivee?
= link_to('X', url_for(controller: 'admin/procedures', action: :destroy, id: procedure.id), 'data-method' => :delete, class: 'btn-sm btn-danger')
= smart_listing.paginate

8
app/views/admin/procedures/_modal_publish.html.haml
View file

@ -6,14 +6,14 @@
%button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
%span{ "aria-hidden" => "true" } ×
%h4#myModalLabel.modal-title
= @procedure.archived? ? 'Réactiver' : 'Publier'
= @procedure.archivee? ? 'Réactiver' : 'Publier'
la procédure
%span#publish-modal-title
.modal-body
Vous vous apprêtez à
= @procedure.archived? ? 'republier' : 'publier'
= @procedure.archivee? ? 'republier' : 'publier'
votre procédure au public.
- unless @procedure.archived?
- unless @procedure.archivee?
%b
Elle ne pourra plus être modifiée à l'issue de cette publication.
%br
@ -42,7 +42,7 @@
#path_is_invalid.text-danger.center.message
= t('activerecord.errors.models.procedure_path.attributes.path.format')
.modal-footer
= submit_tag "#{@procedure.archived? ? 'Réactiver' : 'Publier'}", class: %w(btn btn btn-success),
= submit_tag "#{@procedure.archivee? ? 'Réactiver' : 'Publier'}", class: %w(btn btn btn-success),
id: 'publish',
disabled: :disabled
= button_tag 'Annuler', class: %w(btn btn btn-default), id: 'cancel', data: { dismiss: 'modal' }

6
app/views/admin/procedures/show.html.haml
View file

@ -18,7 +18,7 @@
= render partial: '/admin/procedures/modal_transfer'
- if @facade.procedure.archived?
- if @facade.procedure.archivee?
%a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publish-modal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px;' }
%i.fa.fa-eraser
Réactiver
@ -26,7 +26,7 @@
= render partial: '/admin/procedures/modal_publish'
- elsif @facade.procedure.published?
= form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style: 'float: right; margin-top: 10px;' do
= form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archivee?), method: :put, style: 'float: right; margin-top: 10px;' do
%button#archive.btn.btn-small.btn-default.text-info{ type: :button }
%i.fa.fa-eraser
Archiver
@ -130,7 +130,7 @@
- else
= pie_chart @facade.dossiers_for_pie_highchart
- if @facade.procedure.published? || @facade.procedure.archived?
- if @facade.procedure.published? || @facade.procedure.archivee?
%h3 Supprimer la procédure
.alert.alert-danger
%p