diff options
| -rw-r--r-- | app/models/chouette/stop_area.rb | 6 | ||||
| -rw-r--r-- | db/schema.rb | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb index a5573959b..bb8747faa 100644 --- a/app/models/chouette/stop_area.rb +++ b/app/models/chouette/stop_area.rb @@ -113,13 +113,7 @@ module Chouette end end -<<<<<<< HEAD alias_method :local_id, :user_objectid -======= - def local_id - id.to_s - end ->>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas def children_in_depth return [] if self.children.empty? diff --git a/db/schema.rb b/db/schema.rb index 43f989e38..596682ce8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,14 +11,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180126134944) do +ActiveRecord::Schema.define(version: 20180202170009) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "hstore" enable_extension "postgis" + enable_extension "hstore" enable_extension "unaccent" - enable_extension "objectid" create_table "access_links", id: :bigserial, force: :cascade do |t| t.integer "access_point_id", limit: 8 @@ -94,9 +93,6 @@ ActiveRecord::Schema.define(version: 20180126134944) do t.integer "workgroup_id", limit: 8 t.integer "int_day_types" t.date "excluded_dates", array: true - t.integer "workgroup_id", limit: 8 - t.integer "int_day_types" - t.date "excluded_dates", array: true end add_index "calendars", ["organisation_id"], name: "index_calendars_on_organisation_id", using: :btree @@ -123,7 +119,6 @@ ActiveRecord::Schema.define(version: 20180126134944) do t.datetime "updated_at" t.date "end_date" t.string "date_type" - t.string "mode" end add_index "clean_ups", ["referential_id"], name: "index_clean_ups_on_referential_id", using: :btree |