Fix pipelines visualisation rendering

This commit is contained in:
Kamil Trzcinski 2016-08-17 09:46:34 +01:00
parent ef76726864
commit fee7992c08
3 changed files with 15 additions and 7 deletions

View File

@ -102,7 +102,7 @@ module Ci
end end
def playable? def playable?
project.builds_enabled? && commands.present? && manual? project.builds_enabled? && commands.present? && manual? && skipped?
end end
def play(current_user = nil) def play(current_user = nil)

View File

@ -34,6 +34,10 @@ module Ci
CommitStatus.where(pipeline: pluck(:id)).stages CommitStatus.where(pipeline: pluck(:id)).stages
end end
def stages
statuses.order(:stage_idx).latest.group_by(&:stage)
end
def project_id def project_id
project.id project.id
end end

View File

@ -1,9 +1,8 @@
.row-content-block.build-content.middle-block.pipeline-graph .row-content-block.build-content.middle-block.pipeline-graph
.pipeline-visualization .pipeline-visualization
%ul.stage-column-list %ul.stage-column-list
- pipeline.statuses.stages.each do |stage| - stages = pipeline.statuses.latest.order(:stage_idx).group_by(&:stage)
- statuses = pipeline.statuses.where(stage: stage) - stages.each do |stage, builds|
- status = statuses.latest.status
%li.stage-column %li.stage-column
.stage-name .stage-name
%a{name: stage} %a{name: stage}
@ -11,11 +10,16 @@
= stage.titleize = stage.titleize
.builds-container .builds-container
%ul %ul
- statuses.each do |build| - builds.each do |build|
%li.build %li.build
.build-content .build-content
%span{class: "ci-status-link ci-status-icon-#{status}"} %span{class: "ci-status-link ci-status-icon-#{build.status}"}
= ci_icon_for_status(status) - if build.try(:playable?)
= link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play' do
= icon('play')
- else
= link_to namespace_project_build_url(build.project.namespace, build.project, build) do
= ci_icon_for_status(build.status)
= build.name = build.name
.row-content-block.build-content.middle-block.pipeline-graph .row-content-block.build-content.middle-block.pipeline-graph