diff options
| -rw-r--r-- | app/assets/javascripts/referentials.js.coffee | 13 | ||||
| -rw-r--r-- | app/controllers/referentials_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/referentials/_referential.erb | 1 | ||||
| -rw-r--r-- | app/views/referentials/show.js.erb | 28 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/new.js.erb | 4 | ||||
| -rw-r--r-- | db/schema.rb | 35 |
6 files changed, 50 insertions, 34 deletions
diff --git a/app/assets/javascripts/referentials.js.coffee b/app/assets/javascripts/referentials.js.coffee deleted file mode 100644 index 020fbbd1f..000000000 --- a/app/assets/javascripts/referentials.js.coffee +++ /dev/null @@ -1,13 +0,0 @@ -jQuery -> - update_infos = (json) -> - info = $('#referential_'+json.referential_id+' .info') - update_info = (key, value) -> - $(info.find('.'+key)[0]).text( value) if key.match(/_count$/) - $.each( json, update_info) - - update_referential_details = (ref) -> - ref_id = $(ref).attr("id").match( /(\d+)$/)[0] - $.getJSON( '/referentials/'+ref_id+'.json', update_infos) - - update_referential_details(ref) for ref in $('.referentials.index .referential') - diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index 18a01daeb..447c48bc3 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -1,7 +1,8 @@ class ReferentialsController < InheritedResources::Base respond_to :html respond_to :json, :only => :show - + respond_to :js, :only => :show + def show resource.switch show! do |format| diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb index 6039b042d..392b611d0 100644 --- a/app/views/referentials/_referential.erb +++ b/app/views/referentials/_referential.erb @@ -10,4 +10,5 @@ <%= link_to t("actions.destroy"), referential_path(referential), :method => :delete, :data => {:confirm => t('referentials.actions.destroy_confirm')}, :class => "remove" %> </div> </div> + <%= javascript_include_tag referential_path(referential, :format => :js) %> <% end %> diff --git a/app/views/referentials/show.js.erb b/app/views/referentials/show.js.erb new file mode 100644 index 000000000..453c0161c --- /dev/null +++ b/app/views/referentials/show.js.erb @@ -0,0 +1,28 @@ +$(document).ready(function() { + + jQuery(function() { +var ref, update_infos, update_referential_details, _i, _len, _ref, _results; +update_infos = function(json) { +var info, update_info; +info = $('#referential_' + json.referential_id + ' .info'); +update_info = function(key, value) { +if (key.match(/_count$/)) { +return $(info.find('.' + key)[0]).text(value); +} +}; +return $.each(json, update_info); +}; +update_referential_details = function(ref) { +var ref_id; +ref_id = $(ref).attr("id").match(/(\d+)$/)[0]; +return $.getJSON(<%= referential_path(@referential, :type => :json) %>, update_infos); +}; +_ref = $('.referentials.index .referential'); +_results = []; +for (_i = 0, _len = _ref.length; _i < _len; _i++) { +ref = _ref[_i]; +_results.push(update_referential_details(ref)); +} +return _results; +}); + diff --git a/app/views/vehicle_journeys/new.js.erb b/app/views/vehicle_journeys/new.js.erb index 473c6be57..65e5dfccb 100644 --- a/app/views/vehicle_journeys/new.js.erb +++ b/app/views/vehicle_journeys/new.js.erb @@ -1,8 +1,8 @@ $(document).ready(function() { $("#vehicle_journey_journey_pattern_id").change( function(){ - var url = "<%= "/referentials/#{@referential.id}/lines/#{@line.id}/routes/#{@route.id}/journey_patterns/" %>"; - url = url + $("#vehicle_journey_journey_pattern_input select option:selected").attr("value") + + var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>"; + url = url + "/" + $("#vehicle_journey_journey_pattern_input select option:selected").attr("value") + "/new_vehicle_journey"; $.get(url); } diff --git a/db/schema.rb b/db/schema.rb index 17430230a..7be6c3f3d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -63,13 +63,12 @@ ActiveRecord::Schema.define(:version => 20121211085620) do add_index "access_points", ["objectid"], :name => "access_points_objectid_key", :unique => true - create_table "api_keys", :id => false, :force => true do |t| - t.integer "id", :limit => 8 + create_table "api_keys", :force => true do |t| t.integer "referential_id" t.string "token" t.string "name" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "companies", :force => true do |t| @@ -124,8 +123,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do t.datetime "failed_at" t.string "locked_by" t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" @@ -136,8 +135,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do t.string "arguments", :limit => 1000 t.integer "position" t.string "severity" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "export_log_messages", ["export_id"], :name => "index_export_log_messages_on_export_id" @@ -147,8 +146,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do t.string "status" t.string "type" t.string "options" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "references_type" t.string "reference_ids" end @@ -230,8 +229,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do t.string "arguments", :limit => 1000 t.integer "position" t.string "severity" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "import_log_messages", ["import_id"], :name => "index_import_log_messages_on_import_id" @@ -239,8 +238,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do create_table "imports", :force => true do |t| t.integer "referential_id" t.string "status" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "type" t.string "options" t.string "file_type" @@ -333,8 +332,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do create_table "referentials", :force => true do |t| t.string "name" t.string "slug" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "prefix" t.string "projection_type" t.string "time_zone" @@ -468,8 +467,8 @@ ActiveRecord::Schema.define(:version => 20121211085620) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "organisation_id" t.string "name" t.string "confirmation_token" |