diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-12 13:58:38 +0200 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-13 09:05:07 +0200 |
| commit | 93742a439ab4492ef7a25cb9ddfd6ae004a1fc81 (patch) | |
| tree | 773d1d5f10104dfa5897cea9f67884b787f4a9a7 | |
| parent | d39e314cf5896ac06219446dc1ab8707f222d0d8 (diff) | |
| download | gitlab-ce-93742a439ab4492ef7a25cb9ddfd6ae004a1fc81.tar.gz | |
Code refactoring
| -rw-r--r-- | app/views/projects/builds/_table.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 10 | ||||
| -rw-r--r-- | app/views/shared/builds/_tabs.html.haml | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/app/views/projects/builds/_table.html.haml b/app/views/projects/builds/_table.html.haml index d77405b2b1f..61eff73da26 100644 --- a/app/views/projects/builds/_table.html.haml +++ b/app/views/projects/builds/_table.html.haml @@ -1,4 +1,4 @@ -- admin = false unless defined?(admin) +- admin = local_assigns.fetch(:admin, false) - if builds.blank? %li @@ -19,9 +19,6 @@ %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, 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? } + = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: admin || project.build_coverage_enabled?, admin: admin } = paginate builds, theme: 'gitlab' diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 37e507ea00a..fd3d94bee9b 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -1,4 +1,10 @@ -- admin = false unless defined?(admin) +- admin = local_assigns.fetch(:admin, false) +- ref = local_assigns.fetch(:ref, nil) +- commit_sha = local_assigns.fetch(:commit_sha, nil) +- retried = local_assigns.fetch(:retried, false) +- stage = local_assigns.fetch(:stage, false) +- coverage = local_assigns.fetch(:coverage, false) +- allow_retry = local_assigns.fetch(:allow_retry, false) %tr.build.commit %td.status @@ -52,7 +58,7 @@ - if build.project = link_to build.project.name_with_namespace, admin_namespace_project_path(build.project.namespace, build.project) - - if defined?(runner) && runner + - if admin %td - if build.try(:runner) = runner_link(build.runner) diff --git a/app/views/shared/builds/_tabs.html.haml b/app/views/shared/builds/_tabs.html.haml index 49ab28bd47b..60353aee7f1 100644 --- a/app/views/shared/builds/_tabs.html.haml +++ b/app/views/shared/builds/_tabs.html.haml @@ -1,23 +1,23 @@ %ul.nav-links - %li{class: ('active' if scope.nil?)} + %li{ class: ('active' if scope.nil?) } = 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')} + %li{ class: ('active' if scope == 'pending') } = 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')} + %li{ class: ('active' if scope == 'running') } = 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')} + %li{ class: ('active' if scope == 'finished') } = link_to build_path_proc.call('finished') do Finished %span.badge |