diff options
| author | cedricnjanga | 2018-01-24 19:55:56 -0800 |
|---|---|---|
| committer | cedricnjanga | 2018-01-31 07:20:21 -0800 |
| commit | dd61691343892d502842341bc94ca8b355a716cc (patch) | |
| tree | 289bce2b8e2b1b8b0fdd139e0dc3d31b85e0c8f7 /app/helpers | |
| parent | 6632217117a66bd09b2e8261e4351add9971d47c (diff) | |
| download | chouette-core-dd61691343892d502842341bc94ca8b355a716cc.tar.bz2 | |
update calendar build_links for table builder
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/table_builder_helper/url.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ -21,10 +21,14 @@ module TableBuilderHelper 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 |