aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2018-01-23 22:46:16 -0800
committercedricnjanga2018-02-06 11:21:37 -0800
commitb4ea175349adaffe4c797c7077865b2dd1c0fc20 (patch)
tree4cb2028e7c1b3320623dbdf1049830bd3381bfb3
parent3fa91b720184edfe319081230decc13f695072b2 (diff)
downloadchouette-core-b4ea175349adaffe4c797c7077865b2dd1c0fc20.tar.bz2
First draft for including calendars into workgroup for having appropriate scoping
-rw-r--r--app/helpers/table_builder_helper/url.rb2
-rw-r--r--db/schema.rb2
2 files changed, 2 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 99c02594a..4e78658c2 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: 20180126134944) do
+ActiveRecord::Schema.define(version: 20180123174450) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"