Merge branch 'master' of github.com:afimb/chouette2

3 files changed, 31 insertions, 14 deletions

diff --git a/app/assets/javascripts/import_tasks.js.coffee b/app/assets/javascripts/import_tasks.js.coffee
index 690d86976..66adac461 100644
--- a/app/assets/javascripts/import_tasks.js.coffee
+++ b/app/assets/javascripts/import_tasks.js.coffee
@@ -1,10 +1,17 @@
 jQuery ->
 
-  import_format_change = (event) -> 
+  import_format_change = (event) ->
     import_task_type = $("input:radio:checked").attr("value")
-    console.log("import_task_type="+import_task_type)
-    $(form).toggle($(form).is("#" + import_task_type + "_new")) for form in $('form.import_task[method = "post"]')  
+    $(form).toggle($(form).is("#" + import_task_type + "_new")) for form in $('form.import_task[method = "post"]')
 
   $("#import_task_format_input :radio[name='import_task[format]']").change(import_format_change)
-  
-  $('.import_tasks [title]').tipsy({gravity: 'w'})
\ No newline at end of file
+
+  $('.import_tasks [title]').tipsy({gravity: 'w'})
+
+  import_check_change = (event) ->
+    import_task_type = $("input:radio:checked").attr("value")
+    format_class = '#' + import_task_type + "_new"
+    state = $(format_class + ' input[name="import_task[no_save]"]:checked') == "1"
+    $(format_class + " #import_task_rule_parameter_set_id_input").toggle(  )
+
+  $(check_input).change(import_check_change) for check_input in $('form input[name="import_task[no_save]"][type="checkbox"]')
diff --git a/db/migrate/20140207162334_remove_transport_mode_parameter_set.rb b/db/migrate/20140207162334_remove_transport_mode_parameter_set.rb
new file mode 100644
index 000000000..d2cac4019
--- /dev/null
+++ b/db/migrate/20140207162334_remove_transport_mode_parameter_set.rb
@@ -0,0 +1,18 @@
+class RemoveTransportModeParameterSet < ActiveRecord::Migration
+  def up
+    if table_exists? :transport_mode_parameter_sets
+      drop_table :transport_mode_parameter_sets
+    end
+  end
+
+  def down
+    unless table_exists? :transport_mode_parameter_sets
+      create_table :transport_mode_parameter_sets do |a|
+        a.belongs_to :rule_parameter_set  ,:limit => 8
+        a.string :transport_mode
+        a.text :parameters
+        a.timestamps
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f6203e6d7..72f288c1b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140113103544) do
+ActiveRecord::Schema.define(:version => 20140207162334) do
 
   create_table "access_links", :force => true do |t|
     t.integer  "access_point_id",                        :limit => 8
@@ -464,14 +464,6 @@ ActiveRecord::Schema.define(:version => 20140113103544) do
   add_index "time_tables_vehicle_journeys", ["time_table_id"], :name => "index_time_tables_vehicle_journeys_on_time_table_id"
   add_index "time_tables_vehicle_journeys", ["vehicle_journey_id"], :name => "index_time_tables_vehicle_journeys_on_vehicle_journey_id"
 
-  create_table "transport_mode_parameter_sets", :force => true do |t|
-    t.integer  "rule_parameter_set_id", :limit => 8
-    t.string   "transport_mode"
-    t.text     "parameters"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "email",                                :default => "", :null => false
     t.string   "encrypted_password",                   :default => ""