form: remove the "Delete draft" button
Draft can now be deleted from the dossiers list. This is the best place to delete it (as it allow to clean the list) – and it is better than asking the user if they want to delete a draft *precisely while they are filling the form*.
This commit is contained in:
parent
ac4d084463
commit
934368616c
4 changed files with 5 additions and 26 deletions
|
@ -311,8 +311,9 @@
|
||||||
margin-left: $default-spacer;
|
margin-left: $default-spacer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button.danger {
|
// If there are more than one button, align the "Send" button to the right
|
||||||
margin-right: auto;
|
.button:not(:first-of-type).send {
|
||||||
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,8 +322,7 @@
|
||||||
flex-direction: column-reverse;
|
flex-direction: column-reverse;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.button,
|
.button {
|
||||||
.button.danger {
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 350px;
|
max-width: 350px;
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
%input{ type: "password", value: "12345678" }
|
%input{ type: "password", value: "12345678" }
|
||||||
.send-wrapper
|
.send-wrapper
|
||||||
= f.submit 'Enregistrer un brouillon (formnovalidate)', formnovalidate: true, class: 'button send'
|
= f.submit 'Enregistrer un brouillon (formnovalidate)', formnovalidate: true, class: 'button send'
|
||||||
= f.submit 'Envoyer', class: 'button send'
|
= f.submit 'Envoyer', class: 'button send primary'
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
|
|
|
@ -70,13 +70,6 @@
|
||||||
- if !apercu
|
- if !apercu
|
||||||
.send-wrapper
|
.send-wrapper
|
||||||
- if dossier.brouillon?
|
- if dossier.brouillon?
|
||||||
- if current_user.owns?(dossier)
|
|
||||||
= link_to ask_deletion_dossier_path(dossier),
|
|
||||||
method: :post,
|
|
||||||
class: 'button danger',
|
|
||||||
data: { disable: true, confirm: "En continuant, vous allez supprimer ce dossier ainsi que les informations qu’il contient. Toute suppression entraine l’annulation de la démarche en cours.\n\nConfirmer la suppression ?" } do
|
|
||||||
Supprimer le brouillon
|
|
||||||
|
|
||||||
= f.button 'Enregistrer le brouillon',
|
= f.button 'Enregistrer le brouillon',
|
||||||
formnovalidate: true,
|
formnovalidate: true,
|
||||||
name: :save_draft,
|
name: :save_draft,
|
||||||
|
|
|
@ -112,20 +112,6 @@ feature 'The user' do
|
||||||
expect(page).to have_current_path(merci_dossier_path(user_dossier))
|
expect(page).to have_current_path(merci_dossier_path(user_dossier))
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'delete a draft', js: true do
|
|
||||||
log_in(user.email, password, simple_procedure)
|
|
||||||
fill_individual
|
|
||||||
|
|
||||||
page.accept_alert('Confirmer la suppression ?') do
|
|
||||||
click_on 'Supprimer le brouillon'
|
|
||||||
end
|
|
||||||
|
|
||||||
expect(page).to have_current_path(dossiers_path)
|
|
||||||
expect(page).to have_text('Votre dossier a bien été supprimé')
|
|
||||||
expect(page).not_to have_text(user_dossier.procedure.libelle)
|
|
||||||
expect(user_dossier.reload.hidden_at).to be_present
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def log_in(email, password, procedure)
|
def log_in(email, password, procedure)
|
||||||
|
|
Loading…
Reference in a new issue