Commit e1e677a6 authored by Filipa Lacerda's avatar Filipa Lacerda

Changes after review

parent 1aa3294c
- status = subject.detailed_status(current_user)
- icon = "#{status.icon}_borderless"
- klass = "ci-status-icon ci-status-icon-#{status}"
%span{ class: klass }= custom_icon(icon)
...@@ -44,10 +44,11 @@ ...@@ -44,10 +44,11 @@
- pipeline.stages.each do |stage| - pipeline.stages.each do |stage|
- if stage.status - if stage.status
- detailed_status = stage.detailed_status(current_user) - detailed_status = stage.detailed_status(current_user)
- details_path = detailed_status.details_path if detailed_status.has_details?
- klass = "has-tooltip ci-status-icon ci-status-icon-#{detailed_status}" - klass = "has-tooltip ci-status-icon ci-status-icon-#{detailed_status}"
- hasMultipleBuilds = stage.statuses.count > 1 - hasMultipleBuilds = stage.statuses.count > 1
- tooltip = "#{stage.name.titleize}: #{stage.status || 'not found'}" - icon_status = "#{detailed_status.icon}_borderless"
- icon_status_klass = "ci-status-icon ci-status-icon-#{detailed_status}"
- tooltip = "#{stage.name}: #{detailed_status.label || 'not found'}"
.stage-container.mini-pipeline-graph .stage-container.mini-pipeline-graph
- if hasMultipleBuilds - if hasMultipleBuilds
...@@ -55,7 +56,7 @@ ...@@ -55,7 +56,7 @@
%button.has-tooltip.builds-dropdown{ type: 'button', data: { toggle: 'dropdown', title: tooltip} } %button.has-tooltip.builds-dropdown{ type: 'button', data: { toggle: 'dropdown', title: tooltip} }
%span{ class: klass } %span{ class: klass }
%span.mini-pipeline-graph-icon-container %span.mini-pipeline-graph-icon-container
= render 'ci/status/mini_graph_badge', subject: stage %span{ class: icon_status_klass }= custom_icon(icon_status)
= icon('caret-down', class: 'dropdown-caret') = icon('caret-down', class: 'dropdown-caret')
.dropdown-menu.grouped-pipeline-dropdown .dropdown-menu.grouped-pipeline-dropdown
.arrow-up .arrow-up
...@@ -64,10 +65,10 @@ ...@@ -64,10 +65,10 @@
%li.dropdown-build %li.dropdown-build
= render 'ci/status/graph_badge', subject: status = render 'ci/status/graph_badge', subject: status
- else - else
- if details_path - if detailed_status.has_details?
= link_to details_path, class: klass, title: tooltip do = link_to detailed_status.details_path, class: klass, title: tooltip do
%span.mini-pipeline-graph-icon-container %span.mini-pipeline-graph-icon-container
= render 'ci/status/mini_graph_badge', subject: stage %span{ class: icon_status_klass }= custom_icon(icon_status)
%td %td
- if pipeline.duration - if pipeline.duration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment