aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2013-07-15 11:03:29 +0200
committerMarc Florisson2013-07-15 11:03:29 +0200
commit3437a1b409083bc76ac0a1690df7d21b34b1cefd (patch)
tree29588a1a361221656566a5be6290f3006c0515bd
parentc4b365a555e4e5243ef2f3594e2b5e2fc02822a8 (diff)
downloadchouette-core-3437a1b409083bc76ac0a1690df7d21b34b1cefd.tar.bz2
refactor import view with radio buttons
-rw-r--r--app/assets/javascripts/imports.js.coffee5
-rw-r--r--app/views/imports/new.html.erb2
-rw-r--r--spec/views/imports/new.html.erb_spec.rb4
3 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/imports.js.coffee b/app/assets/javascripts/imports.js.coffee
index 6bccc3ef6..ea6473595 100644
--- a/app/assets/javascripts/imports.js.coffee
+++ b/app/assets/javascripts/imports.js.coffee
@@ -2,7 +2,8 @@ jQuery ->
$('#import_type_submit').hide()
import_type_change = (event) ->
- import_type = $("select option:selected").attr("value")
+ import_type = $("input:radio:checked").attr("value")
+ console.log("import_type="+import_type)
$(form).toggle($(form).is("#" + import_type + "_new")) for form in $('form.import[method = "post"]')
- $('#import_type').change(import_type_change)
+ $("#import_type_input :radio[name='import[type]']").change(import_type_change)
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index 23fb3b0cd..f99ca9062 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -2,7 +2,7 @@
<%= 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.map { |format| [ Import.format_name(format), format]}, :required => true, :include_blank => false %>
+ <%= form.input :type, :as => :radio, :collection => Import.types.map { |format| [ Import.format_name(format), format]}, :required => true, :include_blank => false %>
<% end %>
<% end %>
diff --git a/spec/views/imports/new.html.erb_spec.rb b/spec/views/imports/new.html.erb_spec.rb
index dd39a06d5..081999c60 100644
--- a/spec/views/imports/new.html.erb_spec.rb
+++ b/spec/views/imports/new.html.erb_spec.rb
@@ -7,9 +7,9 @@ describe "imports/new.html.erb" do
let!(:available_imports) { assign(:available_imports, []) }
- it "should display a select to choose import type" do
+ it "should display a radio button to choose import type" do
render
- rendered.should have_selector("select", :name => "import[type]")
+ rendered.should have_selector("input", :type => "radio", :name => "import[type]")
end
end