diff options
| -rw-r--r-- | app/models/data_format_enumerations.rb | 2 | ||||
| -rw-r--r-- | app/views/organisations/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/referentials/_form.erb | 2 | ||||
| -rw-r--r-- | db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb | 22 | ||||
| -rw-r--r-- | db/schema.rb | 8 |
5 files changed, 29 insertions, 7 deletions
diff --git a/app/models/data_format_enumerations.rb b/app/models/data_format_enumerations.rb index 2e5586403..94c39e152 100644 --- a/app/models/data_format_enumerations.rb +++ b/app/models/data_format_enumerations.rb @@ -2,5 +2,5 @@ module DataFormatEnumerations extend Enumerize extend ActiveModel::Naming - enumerize :data_format, in: %w[neptune netex gtfs hub] + enumerize :data_format, in: %w[neptune netex gtfs hub], default: "neptune" end diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb index 83ac7c031..cd1dacc7b 100644 --- a/app/views/organisations/edit.html.erb +++ b/app/views/organisations/edit.html.erb @@ -3,7 +3,7 @@ <%= semantic_form_for @organisation, :url => organisation_path do |form| %> <%= form.inputs do %> <%= form.input :name %> - <%= form.input :data_format, :label => true %> + <%= form.input :data_format, :label => true, :include_blank => false %> <% end %> <%= form.actions do %> diff --git a/app/views/referentials/_form.erb b/app/views/referentials/_form.erb index 7d33d8009..f2963e46e 100644 --- a/app/views/referentials/_form.erb +++ b/app/views/referentials/_form.erb @@ -14,7 +14,7 @@ <%= 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")} %> - <%= form.input :data_format, :label => true %> + <%= form.input :data_format, :label => true, :include_blank => false %> <% end %> <%= form.actions do %> diff --git a/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb b/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb new file mode 100644 index 000000000..9efd941c4 --- /dev/null +++ b/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb @@ -0,0 +1,22 @@ +class SetDefaultValueForDataFormatInOrganisation < ActiveRecord::Migration + def change + Organisation.all.each do |organisation| + if organisation.data_format.neptune? + organisation.update_attributes :data_format => "neptune" + end + end + Referential.all.each do |referential| + if referential.data_format.neptune? + referential.update_attributes :data_format => "neptune" + elsif referential.data_format.netex? + referential.update_attributes :data_format => "netex" + elsif referential.data_format.gtfs? + referential.update_attributes :data_format => "gtfs" + elsif referential.data_format.hub? + referential.update_attributes :data_format => "hub" + end + end + + change_column :organisations, :data_format, :string, :default => "neptune" + end +end diff --git a/db/schema.rb b/db/schema.rb index f07e8cf93..a8e24ac33 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 => 20150304090743) do +ActiveRecord::Schema.define(:version => 20150312104557) do create_table "access_links", :force => true do |t| t.integer "access_point_id", :limit => 8 @@ -326,9 +326,9 @@ ActiveRecord::Schema.define(:version => 20150304090743) do create_table "organisations", :force => true do |t| t.string "name" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "data_format" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "data_format", :default => "neptune" end create_table "pt_links", :force => true do |t| |