Fix broken Runners admin page
This commit is contained in:
parent
f230b42f84
commit
2afb2d3c67
|
@ -17,6 +17,7 @@ module Ci
|
|||
@projects = @projects.where(gitlab_id: @gl_projects.select(:id))
|
||||
end
|
||||
@projects = @projects.where("ci_projects.id NOT IN (?)", @runner.projects.pluck(:id)) if @runner.projects.any?
|
||||
@projects = @projects.joins(:gl_project)
|
||||
@projects = @projects.page(params[:page]).per(30)
|
||||
end
|
||||
|
||||
|
|
|
@ -53,13 +53,14 @@
|
|||
%th
|
||||
- @runner.runner_projects.each do |runner_project|
|
||||
- project = runner_project.project
|
||||
%tr.alert-info
|
||||
%td
|
||||
%strong
|
||||
= project.name
|
||||
%td
|
||||
.pull-right
|
||||
= link_to 'Disable', [:ci, :admin, project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
|
||||
- if project.gl_project
|
||||
%tr.alert-info
|
||||
%td
|
||||
%strong
|
||||
= project.name
|
||||
%td
|
||||
.pull-right
|
||||
= link_to 'Disable', [:ci, :admin, project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
|
||||
|
||||
%table.table
|
||||
%thead
|
||||
|
@ -103,21 +104,26 @@
|
|||
%th Finished at
|
||||
|
||||
- @builds.each do |build|
|
||||
- gl_project = build.gl_project
|
||||
%tr.build
|
||||
%td.id
|
||||
- gl_project = build.project.gl_project
|
||||
= link_to namespace_project_build_path(gl_project.namespace, gl_project, build) do
|
||||
- if gl_project
|
||||
= link_to namespace_project_build_path(gl_project.namespace, gl_project, build) do
|
||||
= build.id
|
||||
- else
|
||||
= build.id
|
||||
|
||||
%td.status
|
||||
= ci_status_with_icon(build.status)
|
||||
|
||||
%td.status
|
||||
= build.project.name
|
||||
- if gl_project
|
||||
= gl_project.name_with_namespace
|
||||
|
||||
%td.build-link
|
||||
= link_to ci_status_path(build.commit) do
|
||||
%strong #{build.commit.short_sha}
|
||||
- if gl_project
|
||||
= link_to ci_status_path(build.commit) do
|
||||
%strong #{build.commit.short_sha}
|
||||
|
||||
%td.timestamp
|
||||
- if build.finished_at
|
||||
|
|
Loading…
Reference in New Issue