From dd61691343892d502842341bc94ca8b355a716cc Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 24 Jan 2018 19:55:56 -0800
Subject: update calendar build_links for table builder

---
 app/helpers/table_builder_helper/url.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/helpers')

diff --git a/app/helpers/table_builder_helper/url.rb b/app/helpers/table_builder_helper/url.rb
index 550b1e9d4..63a559162 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?(Referential) || item.is_a?(ComplianceControlSet)
+      unless item.is_a?(Calendar) || item.is_a?(Referential) || item.is_a?(ComplianceControlSet)
         if referential
           polymorph_url << referential
           polymorph_url << item.line if item.respond_to? :line
@@ -20,11 +20,15 @@ module TableBuilderHelper
           end
         end
       else
+<<<<<<< HEAD
 <<<<<<< HEAD
         polymorph_url << item.workgroup if item.respond_to? :workgroup
 =======
         polymorph_url << item.workgroup if item.is_a?(Calendar)
 >>>>>>> First draft for including calendars into workgroup for having appropriate scoping
+=======
+        polymorph_url << item.workgroup if item.respond_to? :workgroup
+>>>>>>> update calendar build_links for table builder
         polymorph_url << item
       end
 
-- 
cgit v1.2.3