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

[Fix #1689] Only allow plain text for procedure descriptions

Browse source
This commit is contained in:
Frederic Merizen 2018-03-28 17:30:08 +02:00
parent 657d8d9368
commit d825c3d586
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@
%h4 %h4
= value = value
- if key == :description - if key == :description
= f.text_area key, rows: '6', placeholder: 'Description du projet', class: 'form-control wysihtml5' = f.text_area key, rows: '6', placeholder: 'Description du projet', class: 'form-control'
- else - else
= f.text_field key, class: 'form-control', placeholder: value = f.text_field key, class: 'form-control', placeholder: value

2
spec/features/admin/procedure_cloning_spec.rb
View file

@ -12,7 +12,7 @@ feature 'As an administrateur I wanna clone a procedure', js: true do
before 'Create procedure' do before 'Create procedure' do
page.find_by_id('new-procedure').click page.find_by_id('new-procedure').click
fill_in 'procedure_libelle', with: 'libelle de la procedure' fill_in 'procedure_libelle', with: 'libelle de la procedure'
page.execute_script("$('#procedure_description').data('wysihtml5').editor.setValue('description de la procedure')") page.execute_script("$('#procedure_description').val('description de la procedure')")
fill_in 'procedure_organisation', with: 'organisme de la procedure' fill_in 'procedure_organisation', with: 'organisme de la procedure'
page.find_by_id('save-procedure').click page.find_by_id('save-procedure').click
end end

4
spec/features/admin/procedure_creation_spec.rb
View file

@ -36,7 +36,7 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
page.find_by_id('save-procedure').click page.find_by_id('save-procedure').click
page.find_by_id('flash_message').visible? page.find_by_id('flash_message').visible?
fill_in 'procedure_libelle', with: 'libelle de la procedure' fill_in 'procedure_libelle', with: 'libelle de la procedure'
page.execute_script("$('#procedure_description').data('wysihtml5').editor.setValue('description de la procedure')") page.execute_script("$('#procedure_description').val('description de la procedure')")
fill_in 'procedure_organisation', with: 'organisme de la procedure' fill_in 'procedure_organisation', with: 'organisme de la procedure'
page.find_by_id('save-procedure').click page.find_by_id('save-procedure').click
expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.first.id.to_s)) expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.first.id.to_s))
@ -47,7 +47,7 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
before 'Create procedure' do before 'Create procedure' do
page.find_by_id('new-procedure').click page.find_by_id('new-procedure').click
fill_in 'procedure_libelle', with: 'libelle de la procedure' fill_in 'procedure_libelle', with: 'libelle de la procedure'
page.execute_script("$('#procedure_description').data('wysihtml5').editor.setValue('description de la procedure')") page.execute_script("$('#procedure_description').val('description de la procedure')")
fill_in 'procedure_organisation', with: 'organisme de la procedure' fill_in 'procedure_organisation', with: 'organisme de la procedure'
page.find_by_id('save-procedure').click page.find_by_id('save-procedure').click
end end