kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removed other deprecated status helpers 

Updating a couple other places that were still using deprecated status.
This commit is contained in:
Scott Hampton 2019-02-26 10:59:41 -07:00
parent 506ac78d48
commit 2b51745394
7 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/helpers/ci_status_helper.rb
View File

@ -100,43 +100,6 @@ module CiStatusHelper
"pipeline-status/#{pipeline_status.sha}-#{pipeline_status.status}"
end
def render_project_pipeline_status(pipeline_status, tooltip_placement: 'left')
project = pipeline_status.project
path = pipelines_project_commit_path(project, pipeline_status.sha, ref: pipeline_status.ref)
render_status_with_link(
'commit',
pipeline_status.status,
path,
tooltip_placement: tooltip_placement)
end
def render_commit_status(commit, ref: nil, tooltip_placement: 'left')
project = commit.project
path = pipelines_project_commit_path(project, commit, ref: ref)
render_status_with_link(
'commit',
commit.status(ref),
path,
tooltip_placement: tooltip_placement,
icon_size: 24)
end
def render_status_with_link(type, status, path = nil, tooltip_placement: 'left', cssclass: '', container: 'body', icon_size: 16)
klass = "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}"
title = "#{type.titleize}: #{ci_label_for_status(status)}"
data = { toggle: 'tooltip', placement: tooltip_placement, container: container }
if path
link_to ci_icon_for_status(status, size: icon_size), path,
class: klass, title: title, data: data
else
content_tag :span, ci_icon_for_status(status, size: icon_size),
class: klass, title: title, data: data
end
end
def detailed_status?(status)
status.respond_to?(:text) &&
status.respond_to?(:label) &&

13
app/views/ci/status/_icon.html.haml
View File

@ -1,13 +1,10 @@
- status = local_assigns.fetch(:status)
- size = local_assigns.fetch(:size, 16)
- link = local_assigns.fetch(:link, true)
- title = local_assigns.fetch(:title, "Pipeline: #{status.label}")
- type = local_assigns.fetch(:type, 'pipeline')
- title = local_assigns.fetch(:title, "#{type.titleize}: #{status.label}")
- tooltip_placement = local_assigns.fetch(:tooltip_placement, "left")
- css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} #{'has-tooltip' if title.present?}"
- css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} has-tooltip"
- if link && status.has_details?
= link_to status.details_path, class: css_classes, title: title, data: { html: title.present?, placement: tooltip_placement } do
= sprite_icon(status.icon, size: size)
- else
%span{ class: css_classes, title: title, data: { html: title.present?, placement: tooltip_placement } }
- if status.has_details?
= link_to status.details_path, class: css_classes, title: title, data: { html: true, placement: tooltip_placement } do
= sprite_icon(status.icon, size: size)

4
app/views/projects/commits/_commit.html.haml
View File

@ -25,7 +25,7 @@
= commit.short_id
- if commit_status
.d-block.d-sm-none
= render_commit_status(commit, ref: ref)
= render 'ci/status/icon', status: commit.last_pipeline.detailed_status(current_user), type: 'commit', size: 24
- if commit.description?
%button.text-expander.js-toggle-button
= sprite_icon('ellipsis_h', size: 12)
@ -47,7 +47,7 @@
= render partial: 'projects/commit/ajax_signature', locals: { commit: commit }
- if commit_status
= render_commit_status(commit, ref: ref)
= render 'ci/status/icon', status: commit.last_pipeline.detailed_status(current_user), type: 'commit', size: 24
.js-commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id, ref: ref) } }

2
app/views/projects/issues/_merge_requests.html.haml
View File

@ -27,7 +27,7 @@
= merge_request.to_reference
%span.mr-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2
- if merge_request.can_read_pipeline?
= render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), link: true, tooltip_placement: 'bottom'
= render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), tooltip_placement: 'bottom'
- elsif has_any_head_pipeline
= icon('blank fw')

2
app/views/projects/issues/_related_branches.html.haml
View File

@ -8,7 +8,7 @@
- pipeline = @project.pipeline_for(branch, target.sha) if target
- if can?(current_user, :read_pipeline, pipeline)
%span.related-branch-ci-status
= render 'ci/status/icon', status: pipeline.detailed_status(current_user), link: true
= render 'ci/status/icon', status: pipeline.detailed_status(current_user)
%span.related-branch-info
%strong
= link_to branch, project_compare_path(@project, from: @project.default_branch, to: branch), class: "ref-name"

2
app/views/projects/merge_requests/_merge_request.html.haml
View File

@ -48,7 +48,7 @@
CLOSED
- if can?(current_user, :read_pipeline, merge_request.head_pipeline)
%li.issuable-pipeline-status.d-none.d-sm-inline-block
= render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), link: true
= render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user)
- if merge_request.open? && merge_request.broken?
%li.issuable-pipeline-broken.d-none.d-sm-inline-block
= link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do

2
app/views/shared/projects/_project.html.haml
View File

@ -85,6 +85,6 @@
= number_with_delimiter(project.open_issues_count)
- if pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project)
%span.icon-wrapper.pipeline-status
= render_project_pipeline_status(project.pipeline_status, tooltip_placement: 'top')
= render 'ci/status/icon', status: project.commit.last_pipeline.detailed_status(current_user), type: 'commit', tooltip_placement: 'top'
.updated-note
%span Updated #{updated_tooltip}