diff options
| author | cedricnjanga | 2018-02-14 06:26:04 -0800 |
|---|---|---|
| committer | GitHub | 2018-02-14 06:26:04 -0800 |
| commit | 3916476c64dc690195a1273dab7188bb48f69152 (patch) | |
| tree | 4b0c02015b4e41ffb8bad34d3694266eae25ca20 /app/helpers | |
| parent | 2b37ca3b2f57d4c8cb00e18ce39371e7aefc1db3 (diff) | |
| parent | 385a9e1b68f3eea51f71386a8f4856477ba6a273 (diff) | |
| download | chouette-core-3562_ccset_affectation.tar.bz2 | |
Merge branch 'master' into 3562_ccset_affectation3562_ccset_affectation
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/table_builder_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb index 279995741..2068dd23c 100644 --- a/app/helpers/table_builder_helper.rb +++ b/app/helpers/table_builder_helper.rb @@ -330,7 +330,7 @@ module TableBuilderHelper else menu = content_tag :ul, class: 'dropdown-menu' do ( - CustomLinks.new(item, pundit_user, links, referential).links + + CustomLinks.new(item, pundit_user, links, referential, workgroup).links + action_links.select { |link| link.is_a?(Link) } ).map do |link| gear_menu_link(link) |