diff options
| author | Luc Donnet | 2018-01-30 08:57:28 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-30 08:57:28 +0100 |
| commit | 82e4e8694cafed21886b1a21db020802d5e34cc5 (patch) | |
| tree | a15c56bbd9f10c3652f104310ba0fe5ee06684af | |
| parent | d578fbc69fcdfd23cb2c41b7ff3154865e00b462 (diff) | |
| parent | 6a3f5953be119a22a3f32b14eb751df2e16f2dd8 (diff) | |
| download | chouette-core-82e4e8694cafed21886b1a21db020802d5e34cc5.tar.bz2 | |
Merge pull request #267 from af83/5763-fix-referentials-list
5763 Don't truncate referentials name in merge list
| -rw-r--r-- | app/models/merge.rb | 4 | ||||
| -rw-r--r-- | app/views/workbench_outputs/show.html.slim | 2 |
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 \ |