diff options
| author | cedricnjanga | 2018-01-23 22:46:16 -0800 |
|---|---|---|
| committer | cedricnjanga | 2018-02-07 07:19:49 -0800 |
| commit | 308bf4338b3e79016e353555ee3677c917c71805 (patch) | |
| tree | 706c2ffca6fee0446d7e4ed1fa741b3b9ce9dc1c | |
| parent | 187581aae79a28c03d4f26b5a28c81c9b63b0469 (diff) | |
| download | chouette-core-308bf4338b3e79016e353555ee3677c917c71805.tar.bz2 | |
First draft for including calendars into workgroup for having appropriate scoping
| -rw-r--r-- | app/helpers/table_builder_helper/url.rb | 2 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/table_builder_helper/url.rb b/app/helpers/table_builder_helper/url.rb index 0e3dce0aa..57172301c 100644 --- a/app/helpers/table_builder_helper/url.rb +++ b/app/helpers/table_builder_helper/url.rb @@ -3,7 +3,7 @@ module TableBuilderHelper def self.polymorphic_url_parts(item, referential, workgroup) polymorph_url = [] - unless item.is_a?(Calendar) || item.is_a?(Referential) || item.is_a?(ComplianceControlSet) + unless item.is_a?(Referential) || item.is_a?(ComplianceControlSet) if referential polymorph_url << referential polymorph_url << item.line if item.respond_to? :line diff --git a/db/schema.rb b/db/schema.rb index 5474f9161..2b94f655b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180202170009) do +ActiveRecord::Schema.define(version: 20180123174450) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -94,6 +94,7 @@ ActiveRecord::Schema.define(version: 20180202170009) do t.integer "workgroup_id", limit: 8 t.integer "int_day_types" t.date "excluded_dates", array: true + t.integer "workgroup_id", limit: 8 end add_index "calendars", ["organisation_id"], name: "index_calendars_on_organisation_id", using: :btree |