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

Improve build_path name and admin variable

Browse source
This commit is contained in:
Katarzyna Kobierska 2016-09-12 09:52:56 +02:00
parent b902a96324
commit d39e314cf5
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/builds/index.html.haml
View file

@ -4,8 +4,8 @@
%div{ class: container_class }
.top-area
- build_path = ->(scope) { admin_builds_path(scope: scope) }
= render "shared/builds/tabs", build_path: build_path, all_builds: @all_builds, scope: @scope
- build_path_proc = ->(scope) { admin_builds_path(scope: scope) }
= render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
.nav-controls
- if @all_builds.running_or_pending.any?

9
app/views/projects/builds/_table.html.haml
View file

@ -1,4 +1,5 @@
- admin = false unless admin
- admin = false unless defined?(admin)
- if builds.blank?
%li
.nothing-here-block No builds to show
@ -15,13 +16,11 @@
%th Stage
%th Name
%th
%th
- if !admin && project.build_coverage_enabled?
Coverage
%th Coverage
%th
- if admin
= render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, runner: true, admin: true }
= render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, runner: true, coverage: true, admin: true }
- else
= render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: {commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: project.build_coverage_enabled? }

4
app/views/projects/builds/index.html.haml
View file

@ -4,8 +4,8 @@
%div{ class: container_class }
.top-area
- build_path = ->(scope) { project_builds_path(@project, scope: scope) }
= render "shared/builds/tabs", build_path: build_path, all_builds: @all_builds, scope: @scope
- build_path_proc = ->(scope) { project_builds_path(@project, scope: scope) }
= render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
.nav-controls
- if can?(current_user, :update_build, @project)

2
app/views/projects/ci/builds/_build.html.haml
View file

@ -1,4 +1,4 @@
- admin = false unless admin
- admin = false unless defined?(admin)
%tr.build.commit
%td.status

8
app/views/shared/builds/_tabs.html.haml
View file

@ -1,24 +1,24 @@
%ul.nav-links
%li{class: ('active' if scope.nil?)}
= link_to build_path.call(nil) do
= link_to build_path_proc.call(nil) do
All
%span.badge.js-totalbuilds-count
= number_with_delimiter(all_builds.count(:id))
%li{class: ('active' if scope == 'pending')}
= link_to build_path.call('pending') do
= link_to build_path_proc.call('pending') do
Pending
%span.badge
= number_with_delimiter(all_builds.pending.count(:id))
%li{class: ('active' if scope == 'running')}
= link_to build_path.call('running') do
= link_to build_path_proc.call('running') do
Running
%span.badge
= number_with_delimiter(all_builds.running.count(:id))
%li{class: ('active' if scope == 'finished')}
= link_to build_path.call('finished') do
= link_to build_path_proc.call('finished') do
Finished
%span.badge
= number_with_delimiter(all_builds.finished.count(:id))