aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/merge.rb4
-rw-r--r--app/views/workbench_outputs/show.html.slim2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb
index 91be27f2c..62bf581d6 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -20,6 +20,10 @@ class Merge < ActiveRecord::Base
referentials.first(3).map { |r| r.name.truncate(10) }.join(',')
end
+ def full_names
+ referentials.map(&:name).to_sentence
+ end
+
attr_reader :new
def merge!
diff --git a/app/views/workbench_outputs/show.html.slim b/app/views/workbench_outputs/show.html.slim
index dc0a54204..4f71fb7ef 100644
--- a/app/views/workbench_outputs/show.html.slim
+++ b/app/views/workbench_outputs/show.html.slim
@@ -20,7 +20,7 @@
), \
TableBuilderHelper::Column.new( \
key: :name, \
- attribute: 'name', \
+ attribute: 'full_names', \
link_to: lambda do |merge| \
workbench_merge_path merge.workbench, merge \
end \