aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-01-10 15:01:05 +0100
committerAlban Peignier2018-01-10 15:01:05 +0100
commit6c595c90efa16ddcf211713faa701154a67a42bc (patch)
tree88265a20778e03d7f4ddf64176840c895dffcdc5
parent5bc6c3afcf0b38fc90de2089a47dacbcb18e98d5 (diff)
downloadchouette-core-6c595c90efa16ddcf211713faa701154a67a42bc.tar.bz2
Display Merge#name with link and ended_at in workbench_outputs#show. Refs #5299
-rw-r--r--app/views/workbench_outputs/show.html.slim11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/views/workbench_outputs/show.html.slim b/app/views/workbench_outputs/show.html.slim
index 67dc6e8d4..dc0a54204 100644
--- a/app/views/workbench_outputs/show.html.slim
+++ b/app/views/workbench_outputs/show.html.slim
@@ -19,10 +19,21 @@
attribute: Proc.new { |n| import_status(n.status) }, \
), \
TableBuilderHelper::Column.new( \
+ key: :name, \
+ attribute: 'name', \
+ link_to: lambda do |merge| \
+ workbench_merge_path merge.workbench, merge \
+ end \
+ ), \
+ TableBuilderHelper::Column.new( \
key: :started_at, \
attribute: Proc.new { |n| l(n.started_at, format: :long) if n.started_at }, \
), \
TableBuilderHelper::Column.new( \
+ key: :ended_at, \
+ attribute: Proc.new { |n| l(n.ended_at, format: :long) if n.ended_at }, \
+ ), \
+ TableBuilderHelper::Column.new( \
key: :creator, \
attribute: 'creator' \
) \