more work for relations

Author: alexandermeindl

app/helpers/additionals_queries_helper.rb

@@ -267,14 +267,6 @@ def link_to_nonzero(value, path)
   end
 
   def link_to_issues(issues)
-    issues = Array(issues).flatten
     safe_join(issues.map { |issue| link_to_issue(issue, subject: false, tracker: false) }, ', ')
   end
-
-  def link_to_query_filter(url, title:)
-    link_to svg_icon_tag('filter', label: :button_filter),
-            url,
-            title: title.is_a?(Symbol) ? l(title) : title,
-            class: 'icon-only icon-list'
-  end
 end

app/models/query_issues_column.rb

@@ -5,6 +5,11 @@ def initialize
     super(:issues, caption: :field_issue_relation_plural)
   end
 
+  # NOTE: used for CSV and PDF export
+  def value_object(object)
+    (object.send name).ids.join "#{Query.additional_csv_separator} "
+  end
+
   def css_classes
     "entity-relation #{super}"
   end

app/models/query_relations_column.rb

@@ -3,7 +3,9 @@
 class QueryRelationsColumn < QueryColumn
   # NOTE: used for CSV and PDF export
   def value_object(object)
-    (object.send name).map(&:name).join "#{Query.additional_csv_separator} "
+    entries = (object.send name)
+    entries = entries.visible if defined?(entries.visible)
+    entries.map(&:name).join "#{Query.additional_csv_separator} "
   end
 
   def css_classes

lib/additionals/helpers.rb

@@ -2,6 +2,13 @@
 
 module Additionals
   module Helpers
+    def link_to_query_filter(url, title:)
+      link_to svg_icon_tag('filter', label: :button_filter),
+              url,
+              title: title.is_a?(Symbol) ? l(title) : title,
+              class: 'icon-only icon-list'
+    end
+
     def render_breadcrumb(items)
       cnt = items.length
       titles = items.each_with_index.map do |item, index|

test/global_test_helper.rb

@@ -79,6 +79,9 @@ def before_teardown
 
     def assert_select_td_column(column_name, colspan: nil)
       c = column_name.to_s
+                     .gsub('issue.cf', 'issue_cf')
+                     .gsub('project.cf', 'project_cf')
+                     .gsub('user.cf', 'user_cf')
                      .tr('.', '-')
 
       spec = "td.#{c}"