diff options
| author | Marc Florisson | 2013-04-09 10:08:14 +0200 |
|---|---|---|
| committer | Marc Florisson | 2013-04-09 10:08:14 +0200 |
| commit | c18d29924e9ce2bf75d95927598c65327c06fa76 (patch) | |
| tree | 8bdf9aefd545d3fd5e6244d89413836e4dc266a0 | |
| parent | e027b92f60dcd980105ee9b9b34151730bd40f8d (diff) | |
| parent | 2b60913f1c9bc4588f64f468c58af61813890bb7 (diff) | |
| download | chouette-core-c18d29924e9ce2bf75d95927598c65327c06fa76.tar.bz2 | |
Merge branch 'master' of github.com:dryade/chouette2
| -rw-r--r-- | app/assets/javascripts/exports.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/imports.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/exports/new.html.erb | 7 | ||||
| -rw-r--r-- | app/views/imports/new.html.erb | 7 |
4 files changed, 10 insertions, 8 deletions
diff --git a/app/assets/javascripts/exports.js.coffee b/app/assets/javascripts/exports.js.coffee index 6de0d4692..6430c38ba 100644 --- a/app/assets/javascripts/exports.js.coffee +++ b/app/assets/javascripts/exports.js.coffee @@ -18,6 +18,6 @@ jQuery -> export_type_change = (event) -> export_type = $("select option:selected").attr("value") - $(form).toggle($(form).is("#" + export_type + "_new")) for form in $('form.export') + $(form).toggle($(form).is("#" + export_type + "_new")) for form in $('form.export[method = "post"]') $('#export_type').change(export_type_change) diff --git a/app/assets/javascripts/imports.js.coffee b/app/assets/javascripts/imports.js.coffee index ba7372e13..6bccc3ef6 100644 --- a/app/assets/javascripts/imports.js.coffee +++ b/app/assets/javascripts/imports.js.coffee @@ -3,6 +3,6 @@ jQuery -> import_type_change = (event) -> import_type = $("select option:selected").attr("value") - $(form).toggle($(form).is("#" + import_type + "_new")) for form in $('form.import') + $(form).toggle($(form).is("#" + import_type + "_new")) for form in $('form.import[method = "post"]') $('#import_type').change(import_type_change) diff --git a/app/views/exports/new.html.erb b/app/views/exports/new.html.erb index 354268ced..4e7276656 100644 --- a/app/views/exports/new.html.erb +++ b/app/views/exports/new.html.erb @@ -1,8 +1,9 @@ <%= title_tag t(".title") %> -<%= form_for([@referential, @export], :as => :export, :url => new_referential_export_path(@referential), :method => :get) do |form| %> - <%= form.label :type %> - <%= form.collection_select :type, Export.types, :to_s, :to_s %> +<%= semantic_form_for([@referential, @export], :as => :export, :url => new_referential_export_path(@referential), :method => :get) do |form| %> + <%= form.inputs do %> + <%= form.input :type, :as => :select, :collection => Export.types, :required => true, :include_blank => false %> + <% end %> <% end %> <% @available_exports.each do |export| %> diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb index 1b273386c..08995aa87 100644 --- a/app/views/imports/new.html.erb +++ b/app/views/imports/new.html.erb @@ -1,8 +1,9 @@ <%= title_tag t(".title") %> -<%= form_for([@referential, @import], :as => :import, :url => new_referential_import_path(@referential), :method => :get) do |form| %> - <%= form.label :type %> - <%= form.collection_select :type, Import.types, :to_s, :to_s %> +<%= semantic_form_for([@referential, @import], :as => :import, :url => new_referential_import_path(@referential), :method => :get) do |form| %> + <%= form.inputs do %> + <%= form.input :type, :as => :select, :collection => Import.types, :required => true, :include_blank => false %> + <% end %> <% end %> <% @available_imports.each do |import| %> |