diff options
| -rw-r--r-- | app/controllers/referentials_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/referentials/_form.html.slim | 26 | ||||
| -rw-r--r-- | spec/features/referentials_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/workbenches_spec.rb | 2 |
4 files changed, 4 insertions, 34 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index 437444f29..6401676fa 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -130,13 +130,7 @@ class ReferentialsController < BreadcrumbController params.require(:referential).permit( :id, :name, - :slug, - :prefix, - :time_zone, - :upper_corner, - :lower_corner, :organisation_id, - :projection_type, :data_format, :archived_at, :created_from_id, diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim index f209b278e..31d71bcdc 100644 --- a/app/views/referentials/_form.html.slim +++ b/app/views/referentials/_form.html.slim @@ -3,34 +3,16 @@ .row .col-lg-12 = form.input :name - - - if @referential.new_record? - = form.input :slug, input_html: { title: t('formtastic.titles.referential.slug') } - - else - = form.input :slug, disabled: true, input_html: { title: t('formtastic.titles.referential.slug') } - - if @referential.new_record? - if @referential.created_from = form.input :created_from, disabled: true, input_html: { value: Referential.find(@referential.created_from_id).name } .hidden = form.input :created_from_id, as: :hidden - - = form.input :prefix, input_html: { title: t("formtastic.titles.referential.prefix") } - - else - if @referential.created_from = form.input :created_from, disabled: true, input_html: { value: Referential.find(@referential.created_from_id).name } - = form.input :prefix, input_html: { title: t("formtastic.titles.referential.prefix") } - - = form.input :projection_type, as: :select, collection: Referential.available_srids - = form.input :time_zone - - - = form.input :upper_corner, input_html: {title: t("formtastic.titles.referential.upper_corner")} - = form.input :lower_corner, input_html: {title: t("formtastic.titles.referential.lower_corner")} - .separator - + = form.simple_fields_for :metadatas do |subform| .row .col-lg-12 @@ -40,7 +22,7 @@ .alert.alert-danger - @referential.errors[:metadatas].each do |msg| p.small = "- #{msg}" - + .subform .nested-head .wrapper @@ -55,10 +37,10 @@ = t('simple_form.labels.referential.metadatas.periods.end') abbr title='requis' * div - + = subform.simple_fields_for :periods do |period_form| = render 'period_fields', f: period_form - + .links.nested-linker = link_to_add_association 'Ajouter une période', subform, :periods, class: 'btn btn-outline-primary' diff --git a/spec/features/referentials_spec.rb b/spec/features/referentials_spec.rb index 089f818e8..337271fea 100644 --- a/spec/features/referentials_spec.rb +++ b/spec/features/referentials_spec.rb @@ -109,13 +109,9 @@ describe "Referentials", :type => :feature do end describe "create" do - it "should" do visit new_referential_path fill_in "Nom", :with => "Test" - fill_in "Code", :with => "test" - fill_in "Point haut/droite de l'emprise par défaut", :with => "0.0, 0.0" - fill_in "Point bas/gauche de l'emprise par défaut", :with => "1.0, 1.0" click_button "Valider" expect(Referential.where(:name => "Test")).not_to be_nil diff --git a/spec/features/workbenches_spec.rb b/spec/features/workbenches_spec.rb index c11fbd03d..953eb2bf5 100644 --- a/spec/features/workbenches_spec.rb +++ b/spec/features/workbenches_spec.rb @@ -46,8 +46,6 @@ describe 'Workbenches', type: :feature do click_link I18n.t('actions.add') fill_in "referential[name]", with: "Referential to test creation" # Nom du JDD - fill_in "referential[slug]", with: "test" # Code - fill_in "referential[prefix]", with: "test" # Prefix Neptune select workbench.lines.first.id, from: 'referential[metadatas_attributes][0][lines][]' # Lignes click_button "Valider" |