Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#369] changed build list info to the table

This commit is contained in:
Alexander Machehin 2014-05-29 00:30:06 +06:00
parent bbb62b1213
commit 4ad974b829
2 changed files with 197 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/stylesheets/custom_bootstrap.scss
View File

@ -99,8 +99,27 @@ table tbody {
} }
.build-list { .build-list {
.panel-heading {
.build-list-status {
padding: 5px 10px;
color: #000;
}
.build-list-time {
padding: 5px 10px;
}
.bg-nocolor {
background-color: #fff;
}
}
form .row [class^=col-] { form .row [class^=col-] {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
.table-borderless td,
.table-borderless th {
border: 0;
}
} }

356
app/views/projects/build_lists/show.html.haml
View File

@ -1,217 +1,217 @@
-set_meta_tags title: [title_object(@build_list.project), t('activerecord.models.build_list')] -set_meta_tags title: [title_object(@build_list.project), t('activerecord.models.build_list')]
.container.build-list{ 'ng-controller' => 'BuildListController', 'ng-cloak' => true } .container.build-list{ 'ng-controller' => 'BuildListController', 'ng-cloak' => true }
.row .row
.col-md-10.col-md-offset-1 .col-md-10.col-md-offset-1.col-sm-10
.panel.panel-info .panel.panel-primary
.panel-heading .panel-heading
.pull-left{class: '{{build_list.status_color}}'} {{build_list.human_status | i18n}} .build-list-status.pull-left{ 'ng-class' => '"bg-" + build_list.status_color' }
.pull-right {{build_list.human_status | i18n}}
%div{ 'am-time-ago' => 'build_list.updated_at', .pull-right.build-list-time{ 'am-time-ago' => 'build_list.updated_at',
title: "{{build_list.updated_at | amDateFormat:'ddd, LLL'}}" } title: "{{build_list.updated_at | amDateFormat:'ddd, LLL'}}" }
.clearfix .clearfix
.panel-body .panel-body
%h3.offset0.col-md-4.text-right= t 'layout.build_lists.main_data' %h3.offset0= t 'layout.build_lists.main_data'
.clearfix .clearfix
=form_for @build_list, url: publish_build_list_path(@build_list), html: { class: :form } do |f| =form_for @build_list, url: publish_build_list_path(@build_list), html: { class: :form } do |f|
.row %table.table.table-borderless
.col-md-4.text-right= t 'activerecord.attributes.build_list.container_path' %tr
.col-md-8{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISHED}"} %td= t 'activerecord.attributes.build_list.container_path'
- url = container_url %td
= link_to url, url %div{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISHED}"}
.clearfix - url = container_url
.col-md-8.col-md-offset-4{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISH}"} = link_to url, url
= t("layout.build_lists.creating") %div{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISH}"}
.clearfix = t 'layout.build_lists.creating'
.col-md-4.text-right= t 'activerecord.attributes.build_list.id' %tr
.col-md-8 %td= t 'activerecord.attributes.build_list.id'
= @build_list.id %td
= hidden_field_tag :build_list_id, @build_list.id = @build_list.id
.clearfix = hidden_field_tag :build_list_id, @build_list.id
.col-md-4.text-right= t 'activerecord.attributes.build_list.user' %tr
.col-md-8= link_to @build_list.user.try(:fullname), @build_list.user %td= t 'activerecord.attributes.build_list.user'
.clearfix %td= link_to @build_list.user.try(:fullname), @build_list.user
.col-md-4.text-right= t 'activerecord.attributes.build_list.publisher' %tr
.col-md-8{'ng-show' => 'build_list.publisher'} %td= t 'activerecord.attributes.build_list.publisher'
%a{'ng-href' => '{{build_list.publisher.path}}' } {{build_list.publisher.fullname}} %td
.clearfix %a{ 'ng-show' => 'build_list.publisher',
.col-md-4.text-right= t 'activerecord.attributes.build_list.build_for_platform' 'ng-href' => '{{build_list.publisher.path}}' }
.col-md-8 {{build_list.publisher.fullname}}
- if bfp = @build_list.build_for_platform %tr
= link_to(bfp.name, bfp) %td= t 'activerecord.attributes.build_list.build_for_platform'
- else %td
= t 'layout.build_lists.platform_deleted' - if bfp = @build_list.build_for_platform
.clearfix = link_to(bfp.name, bfp)
.col-md-4.text-right= t 'activerecord.attributes.build_list.save_to_repository' - else
.col-md-8 = t 'layout.build_lists.platform_deleted'
= link_to "#{@build_list.save_to_platform.name}/#{@build_list.save_to_repository.name}", [@build_list.save_to_platform, @build_list.save_to_repository] %tr
.clearfix %td= t 'activerecord.attributes.build_list.save_to_repository'
.col-md-4.text-right= t 'activerecord.attributes.build_list.include_testing_subrepository' %td
.col-md-8= t("layout.#{@build_list.include_testing_subrepository?}_") = link_to "#{@build_list.save_to_platform.name}/#{@build_list.save_to_repository.name}",
.clearfix [@build_list.save_to_platform, @build_list.save_to_repository]
.col-md-4.text-right= t 'activerecord.attributes.build_list.include_repos' %tr
.col-md-8= (@build_list.include_repos||[]).map{|r| Repository.where(id: r).first.try(:name)}.join(', ') %td= t 'activerecord.attributes.build_list.include_testing_subrepository'
.clearfix %td= t "layout.#{@build_list.include_testing_subrepository?}_"
.col-md-4.text-right= t 'activerecord.attributes.build_list.update_type' %tr
.col-md-8 %td= t 'activerecord.attributes.build_list.include_repos'
= f.select :update_type, options_for_select(build_list_classified_update_types, %td= (@build_list.include_repos||[]).map{|r| Repository.where(id: r).first.try(:name)}.join(', ')
@build_list.update_type), {}, 'ng-model' => 'build_list.update_type', %tr
'ng-change' => 'updateTypeChanged()', 'ng-show' => 'build_list.can_publish' %td= t 'activerecord.attributes.build_list.update_type'
%div{'ng-hide' => 'build_list.can_publish'}= @build_list.update_type %td
.ng-hide{ 'ng-show' => 'update_type_errors' } = f.select :update_type, options_for_select(build_list_classified_update_types,
.flash_notify @build_list.update_type), {}, 'ng-model' => 'build_list.update_type',
.alert{ 'ng-class' => "{ 'alert-error': update_type_errors }" } 'ng-change' => 'updateTypeChanged()', 'ng-show' => 'build_list.can_publish'
{{ update_type_errors }} %div{'ng-hide' => 'build_list.can_publish'}= @build_list.update_type
.clearfix %tr
%td
.col-md-4.text-right= t 'activerecord.attributes.build_list.auto_publish_status' .ng-hide{ 'ng-show' => 'update_type_errors' }
.col-md-8= t "layout.build_lists.auto_publish_status.#{@build_list.auto_publish_status}" .flash_notify
.clearfix .alert{ 'ng-class' => "{ 'alert-error': update_type_errors }" }
.col-md-4.text-right= t("activerecord.attributes.build_list.auto_create_container") {{ update_type_errors }}
.col-md-8= t "layout.#{@build_list.auto_create_container?}_" %tr
.clearfix %td= t 'activerecord.attributes.build_list.auto_publish_status'
.col-md-4.text-right= t 'activerecord.attributes.build_list.use_cached_chroot' %td= t "layout.build_lists.auto_publish_status.#{@build_list.auto_publish_status}"
.col-md-8= t "layout.#{@build_list.use_cached_chroot?}_" %tr
.clearfix %td= t("activerecord.attributes.build_list.auto_create_container")
.col-md-4.text-right= t 'activerecord.attributes.build_list.project_version' %td= t "layout.#{@build_list.auto_create_container?}_"
.col-md-8= link_to @build_list.project_version, tree_path(@build_list.project, @build_list.project_version) %tr
.clearfix %td= t 'activerecord.attributes.build_list.use_cached_chroot'
.col-md-4.text-right= t 'diff' %td= t "layout.#{@build_list.use_cached_chroot?}_"
.col-md-8= build_list_version_link(@build_list, true) %tr
.clearfix %td= t 'activerecord.attributes.build_list.project_version'
.col-md-4.text-right= t 'activerecord.attributes.build_list.arch' %td= link_to @build_list.project_version, tree_path(@build_list.project, @build_list.project_version)
.col-md-8= @build_list.arch.name %tr
.clearfix %td= t 'diff'
.col-md-4.text-right= t 'activerecord.attributes.build_list.updated_at' %td= build_list_version_link(@build_list, true)
.col-md-8 {{build_list.updated_at_utc}} %tr
.clearfix %td= t 'activerecord.attributes.build_list.arch'
%td= @build_list.arch.name
%tr
%td= t 'activerecord.attributes.build_list.updated_at'
%td {{build_list.updated_at_utc}}
- if @build_list.external_nodes.present? - if @build_list.external_nodes.present?
.col-md-4.text-right= t 'activerecord.attributes.build_list.external_nodes' %tr
.col-md-8= I18n.t "layout.build_lists.external_nodes.#{@build_list.external_nodes}" %td= t 'activerecord.attributes.build_list.external_nodes'
.clearfix %td= I18n.t "layout.build_lists.external_nodes.#{@build_list.external_nodes}"
.col-md-4.text-right= t 'activerecord.attributes.build_list.builder' %tr
.col-md-8{'ng-show' => 'build_list.builder'} %td= t 'activerecord.attributes.build_list.builder'
%a{'ng-href' => '{{build_list.builder.path}}' } {{build_list.builder.fullname}} %td
.clearfix %a{ 'ng-show' => 'build_list.builder', 'ng-href' => '{{build_list.builder.path}}' }
.col-md-4.text-right= t 'activerecord.attributes.build_list.is_circle' {{build_list.builder.fullname}}
.col-md-8= t "layout.#{@build_list.is_circle?}_" %tr
.clearfix %td= t 'activerecord.attributes.build_list.is_circle'
.col-md-4.text-right= t 'activerecord.attributes.build_list.new_core' %td= t "layout.#{@build_list.is_circle?}_"
.col-md-8= t "layout.#{@build_list.new_core?}_" %tr
.clearfix %td= t 'activerecord.attributes.build_list.new_core'
%td= t "layout.#{@build_list.new_core?}_"
- if @build_list.extra_build_lists.present? || @build_list.extra_repositories.present? - if @build_list.extra_build_lists.present? || @build_list.extra_repositories.present?
.col-md-4.text-right= t 'activerecord.attributes.build_list.extra_repositories' %tr
.col-md-8 %td= t 'activerecord.attributes.build_list.extra_repositories'
- Repository.where(id: @build_list.extra_repositories).each do |repo| %td
%p= link_to "#{repo.platform.name}/#{repo.name}", [repo.platform, repo] - Repository.where(id: @build_list.extra_repositories).each do |repo|
- BuildList.where(id: @build_list.extra_build_lists).each do |bl| %p= link_to "#{repo.platform.name}/#{repo.name}", [repo.platform, repo]
%p= link_to "#{bl.id} (#{bl.project.name} - #{bl.arch.name})", bl - BuildList.where(id: @build_list.extra_build_lists).each do |bl|
.clearfix %p= link_to "#{bl.id} (#{bl.project.name} - #{bl.arch.name})", bl
- if @build_list.extra_params.present? - if @build_list.extra_params.present?
.col-md-4.text-right %tr
%h4= t 'activerecord.attributes.build_list.extra_params.label' %td
.col-md-8 %h4= t 'activerecord.attributes.build_list.extra_params.label'
.clearfix %td
%tr
- @build_list.extra_params.each do |k, v| - @build_list.extra_params.each do |k, v|
.col-md-4.text-right= t "activerecord.attributes.build_list.extra_params.#{k}" %td= t "activerecord.attributes.build_list.extra_params.#{k}"
.col-md-8= v %td= v
.clearfix
- if @build_list.mass_build_id.present? - if @build_list.mass_build_id.present?
.col-md-4.text-right= t 'activerecord.attributes.mass_build_id' %tr
.col-md-8= link_to @build_list.mass_build.name, platform_mass_builds_path(@build_list.save_to_platform) %td= t 'activerecord.attributes.mass_build_id'
.clearfix %td= link_to @build_list.mass_build.name, platform_mass_builds_path(@build_list.save_to_platform)
%div{'ng-show' => 'build_list.advisory'} %tr{ 'ng-show' => 'build_list.advisory' }
.col-md-4.text-right= t 'layout.build_lists.attached_advisory' %td= t 'layout.build_lists.attached_advisory'
.col-md-8 %td
%a{'ng-href' => '{{build_list.advisory.path}}' } %a{'ng-href' => '{{build_list.advisory.path}}' }
{{build_list.advisory.advisory_id}} {{build_list.advisory.advisory_id}}
.clearfix
%div{'ng-show' => 'build_list.human_duration'} %tr{'ng-show' => 'build_list.human_duration'}
%br %td
.col-md-4.text-right %td {{build_list.human_duration }}
.col-md-8 {{build_list.human_duration }}
.clearfix
- if @build_list.save_to_platform.released - if @build_list.save_to_platform.released
#advisory_block{'ng-show' => 'build_list.can_publish && !build_list.advisory'} %tr#advisory_block{'ng-show' => 'build_list.can_publish && !build_list.advisory'}
.col-md-4.text-right= label_tag :attach_advisory, t('layout.build_lists.attached_advisory') %td= label_tag :attach_advisory, t('layout.build_lists.attached_advisory')
.col-md-8 %td
= select_tag :attach_advisory, advisories_select_options(@advisories), 'ng-model' => 'attach_advisory', 'ng-change' => 'attachAdvisoryChanged()' = select_tag :attach_advisory, advisories_select_options(@advisories), 'ng-model' => 'attach_advisory', 'ng-change' => 'attachAdvisoryChanged()'
%p.hint_text= t 'layout.advisories.publication_info', update_types: BuildList::RELEASE_UPDATE_TYPES.join(', ') %p.hint_text= t 'layout.advisories.publication_info', update_types: BuildList::RELEASE_UPDATE_TYPES.join(', ')
.clearfix
#advisory_search_block{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'} %tr#advisory_search_block{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'}
%td
%h3= t 'layout.advisories.search_by_id' %h3= t 'layout.advisories.search_by_id'
.col-md-4.text-right= label_tag :advisory_search, t('layout.advisories.search_hint') %td
.col-md-8 = label_tag :advisory_search, t('layout.advisories.search_hint')
%input#advisory_search{type: 'text', 'ng-model' => 'term', 'ng-keyup' => 'search()'} %input#advisory_search{type: 'text', 'ng-model' => 'term', 'ng-keyup' => 'search()'}
%p.hint_text= t 'layout.advisories.advisory_id_info', advisory_format: advisory_id_for_hint %p.hint_text= t 'layout.advisories.advisory_id_info', advisory_format: advisory_id_for_hint
.clearfix
- I18n.t('layout.advisories.banners').keys.each do |key| - I18n.t('layout.advisories.banners').keys.each do |key|
.info{class: key, 'ng-show' => "search_status == '#{key}'"} .info{class: key, 'ng-show' => "search_status == '#{key}'"}
%p= t("layout.advisories.banners.#{key}") %p= t("layout.advisories.banners.#{key}")
#new_advisory_form{'ng-show' => 'attach_advisory == "new"'} #new_advisory_form{'ng-show' => 'attach_advisory == "new"'}
= f.fields_for @build_list.build_advisory do |f| = f.fields_for @build_list.build_advisory do |f|
= render partial: 'advisories/form', locals: {f: f} = render partial: 'advisories/form', locals: {f: f}
#advisory_preview{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'} #advisory_preview{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'}
%h3= t('activerecord.models.advisory') << ' {{advisory.advisory_id}}' %h3= t('activerecord.models.advisory') << ' {{advisory.advisory_id}}'
.col-md-4.text-right= t 'activerecord.attributes.advisory.description' = t 'activerecord.attributes.advisory.description'
.col-md-8.descr {{advisory.description}} .descr {{advisory.description}}
.clearfix
.col-md-4.text-right= t 'activerecord.attributes.advisory.references' = t 'activerecord.attributes.advisory.references'
.col-md-8.refs {{advisory.references}} .refs {{advisory.references}}
.clearfix
%div{'ng-hide' => 'build_list.extra_build_lists_published'} %tr{ 'ng-hide' => 'build_list.extra_build_lists_published' }
.flash_notify %td
.alert.alert-error= t 'layout.build_lists.publish_with_extra_fail' .flash_notify
.alert.alert-error= t 'layout.build_lists.publish_with_extra_fail'
%div{'ng-show' => 'build_list.can_publish && build_list.can_publish_in_future && !build_list.can_publish_into_repository'} %tr{ 'ng-show' => 'build_list.can_publish && build_list.can_publish_in_future && !build_list.can_publish_into_repository' }
%td
.flash_notify .flash_notify
.alert.alert-error= t 'flash.build_list.not_all_build_lists_success' .alert.alert-error= t 'flash.build_list.not_all_build_lists_success'
.col-md-10 - if can?(:cancel, @build_list)
- if can?(:cancel, @build_list) = link_to t('layout.build_lists.cancel'), cancel_build_list_path(@build_list),
= link_to t('layout.build_lists.cancel'), cancel_build_list_path(@build_list), method: :put, data: { confirm: t('layout.confirm') }, class: 'btn btn-primary',
method: :put, data: { confirm: t('layout.confirm') }, class: 'btn btn-primary', 'ng-show' => 'build_list.can_cancel'
'ng-show' => 'build_list.can_cancel' = submit_tag t('layout.publish_again'),
= submit_tag t('layout.publish_again'), data: { confirm: t("layout.publish_again_warning") },
data: { confirm: t("layout.publish_again_warning") }, name: 'publish', class: 'btn btn-primary',
name: 'publish', class: 'btn btn-primary', 'ng-show' => "build_list.can_publish && build_list.status == #{BuildList::BUILD_PUBLISHED}"
'ng-show' => "build_list.can_publish && build_list.status == #{BuildList::BUILD_PUBLISHED}" = submit_tag t('layout.publish'),
= submit_tag t('layout.publish'), data: { confirm: t('layout.build_lists.tests_failed') }, name: 'publish', class: 'btn btn-primary',
data: { confirm: t('layout.build_lists.tests_failed') }, name: 'publish', class: 'btn btn-primary', 'ng-show' => "build_list.can_publish && build_list.can_publish_in_future && build_list.extra_build_lists_published && build_list.status == #{BuildList::TESTS_FAILED}"
'ng-show' => "build_list.can_publish && build_list.can_publish_in_future && build_list.extra_build_lists_published && build_list.status == #{BuildList::TESTS_FAILED}" = submit_tag t('layout.publish'),
= submit_tag t('layout.publish'), data: { confirm: t('layout.confirm') }, name: 'publish', class: 'btn btn-primary',
data: { confirm: t('layout.confirm') }, name: 'publish', class: 'btn btn-primary', 'ng-show' => "build_list.can_publish && build_list.can_publish_in_future && build_list.extra_build_lists_published && build_list.status != #{BuildList::TESTS_FAILED} && build_list.status != #{BuildList::BUILD_PUBLISHED}"
'ng-show' => "build_list.can_publish && build_list.can_publish_in_future && build_list.extra_build_lists_published && build_list.status != #{BuildList::TESTS_FAILED} && build_list.status != #{BuildList::BUILD_PUBLISHED}" = link_to t('layout.publish_into_testing'), publish_into_testing_build_list_path(@build_list),
= link_to t('layout.publish_into_testing'), publish_into_testing_build_list_path(@build_list), method: :put, data: { confirm: t('layout.confirm') },
method: :put, data: { confirm: t('layout.confirm') }, class: 'btn btn-primary',
class: 'btn btn-primary', 'ng-show' => 'build_list.can_publish_into_testing'
'ng-show' => 'build_list.can_publish_into_testing' - if can?(:reject_publish, @build_list)
- if can?(:reject_publish, @build_list) = link_to t('layout.reject_publish'), reject_publish_build_list_path(@build_list),
= link_to t('layout.reject_publish'), reject_publish_build_list_path(@build_list), method: :put, data: { confirm: t('layout.confirm') },
method: :put, data: { confirm: t('layout.confirm') }, class: 'btn btn-primary',
class: 'btn btn-primary', 'ng-show' => 'build_list.can_reject_publish'
'ng-show' => 'build_list.can_reject_publish' - if can?(:create_container, @build_list)
- if can?(:create_container, @build_list) = link_to t('layout.build_lists.create_container'),
= link_to t('layout.build_lists.create_container'), create_container_build_list_path(@build_list),
create_container_build_list_path(@build_list), method: :put, data: { confirm: t('layout.confirm') },
method: :put, data: { confirm: t('layout.confirm') }, class: 'btn btn-primary',
class: 'btn btn-primary', 'ng-show' => 'build_list.can_create_container'
'ng-show' => 'build_list.can_create_container' - if can? :create, @build_list
- if can? :create, @build_list = link_to t('layout.build_lists.recreate_build_list'), new_project_build_list_path(@build_list.project, build_list_id: @build_list.id), class: 'btn btn-primary'
= link_to t('layout.build_lists.recreate_build_list'), new_project_build_list_path(@build_list.project, build_list_id: @build_list.id), class: 'btn btn-primary' .clearfix
.clearfix %div{'ng-show' => "build_list.status == #{BuildList::BUILD_STARTED}"}
%div{'ng-show' => "build_list.status == #{BuildList::BUILD_STARTED}"} = render 'shared/log', { build_started: true, get_log_path: log_build_list_path(@build_list) }
= render 'shared/log', { build_started: true, get_log_path: log_build_list_path(@build_list) }
%hr %hr
%h3= t 'layout.build_lists.items_header' %h3= t 'layout.build_lists.items_header'