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

#369: updated UI for Advisories#show

This commit is contained in:
Vokhmin Alexey V 2014-11-06 00:11:02 +03:00
parent 9fadb6a5ae
commit 0aefdc3dda
8 changed files with 102 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/advisories_controller.rb
View File

@ -1,5 +1,5 @@
class AdvisoriesController < ApplicationController
layout 'bootstrap', only: [:index]
layout 'bootstrap'
before_filter :authenticate_user!
skip_before_filter :authenticate_user! if APP_CONFIG['anonymous_access']

20
app/views/advisories/_packages_info.html.haml
View File

@ -1,20 +0,0 @@
.packages_info_container
%h3= t('layout.advisories.affected_in')
%ul.platforms
- @packages_info.each_pair do |platform, projects|
%li
%p= raw "#{t('activerecord.models.platform')} #{ link_to platform.name, platform_path(platform) }"
%ul
- projects.each_pair do |project, packages|
%li
%p= raw "#{ t('activerecord.models.project') } #{ link_to project.name, project_path(project) }"
%ul
%li
%p= "SRPM:"
%ul
%li= packages[:srpm]
%li
%p= "RPM:"
%ul
- packages[:rpm].each do |package|
%li= package

23
app/views/advisories/_packages_info.html.slim Normal file
View File

@ -0,0 +1,23 @@
.packages_info_container
h3
= t('layout.advisories.affected_in')
ul
- @packages_info.each_pair do |platform, projects|
li
p
=> t('activerecord.models.platform')
= link_to platform.name, platform_path(platform)
ul
- projects.each_pair do |project, packages|
li
p= raw "#{ t('activerecord.models.project') } #{ link_to project.name, project_path(project) }"
ul
li
p SRPM:
ul
li= packages[:srpm]
li
p RPM:
ul
- packages[:rpm].each do |package|
li= package

2
app/views/advisories/index.atom.builder
View File

@ -1,5 +1,5 @@
atom_feed do |feed|
feed.title(t("layout.advisories.atom_title"))
feed.title t('layout.advisories.atom_title')
feed.updated(@advisories.first.created_at) if @advisories.length > 0
@advisories.each do |advisory|

10
app/views/advisories/index.html.haml → app/views/advisories/index.html.slim
View File

@ -1,11 +1,11 @@
- set_meta_tags title: t('layout.advisories.list_header')
- render partial: 'submenu'
.row
.container{ 'ng-controller' => 'AdvisoryCtrl',
'ng-init' => "init(#{params[:q].presence || 'null'})" }
%h3
= t 'layout.advisories.list_header'
- q = params[:q].presence || 'null'
.container ng-controller='AdvisoryCtrl' ng-init="init(#{ q })"
h3
= t('layout.advisories.list_header')
= link_to image_tag("rss.ico", width: '15px', height: '15px', class: 'atom_icon'),
APP_CONFIG['anonymous_access'] ? advisories_path(format: 'atom') : advisories_path(format: 'atom', token: current_user.authentication_token)
= render partial: 'list', object: @advisories
= angularjs_paginate( per_page: Advisory.per_page )
= angularjs_paginate( per_page: Advisory.per_page )

45
app/views/advisories/show.html.haml
View File

@ -1,45 +0,0 @@
- set_meta_tags title: [title_object(@advisory), t('activerecord.models.advisory')]
- render partial: 'submenu'
%h3= "#{t("activerecord.models.advisory")} #{@advisory.advisory_id}".html_safe
.leftlist= "#{t("layout.advisories.project_names")}:".html_safe
.rightlist
= raw @advisory.projects.map{ |p| link_to p.name_with_owner, project_path(p) }.join(', ')
.both
.leftlist= "#{t("activerecord.attributes.advisory.created_at")}:".html_safe
.rightlist= @advisory.created_at
.both
.leftlist= "#{t("activerecord.attributes.advisory.advisory_id")}:".html_safe
.rightlist= @advisory.advisory_id
.both
.leftlist= "#{t("layout.advisories.affected_versions")}:".html_safe
.rightlist
- @advisory.platforms.each do |platform|
= link_to platform_printed_name(platform), platform_path(platform)
%br
.both
.leftlist= "#{t("activerecord.attributes.advisory.description")}:".html_safe
.rightlist= simple_format @advisory.description
.both
.leftlist= "#{t("activerecord.attributes.advisory.references")}:".html_safe
.rightlist
- @advisory.references.gsub(/\r| /, '').split("\n").each do |ref|
= construct_ref_link(ref)
%br
.both
.leftlist= "#{t("layout.advisories.build_lists")}:".html_safe
.rightlist
= raw @advisory.build_lists.map{ |bl| link_to bl.id, build_list_path(bl) }.join(', ')
.both
= render partial: 'packages_info'
:javascript
$('article .all').addClass('bigpadding');

72
app/views/advisories/show.html.slim Normal file
View File

@ -0,0 +1,72 @@
- set_meta_tags title: [title_object(@advisory), t('activerecord.models.advisory')]
- render partial: 'submenu'
.container.col-md-offset-2.col-md-8
.row
h3
=> t('activerecord.models.advisory')
= @advisory.advisory_id
.row
.col-md-6
b
= t('layout.advisories.project_names')
.col-md-6
= raw @advisory.projects.map{ |p| link_to p.name_with_owner, project_path(p) }.join(', ')
.row
.col-md-6
b
= t('activerecord.attributes.advisory.created_at')
.col-md-6
= @advisory.created_at
.row
.col-md-6
b
= t('activerecord.attributes.advisory.advisory_id')
.col-md-6
= @advisory.advisory_id
.row
.col-md-6
b
= t('layout.advisories.affected_versions')
.col-md-6
ul.list-unstyled
- @advisory.platforms.each do |platform|
li
= link_to platform_printed_name(platform), platform_path(platform)
.row
.col-md-6
b
= t('activerecord.attributes.advisory.description')
.col-md-6
= simple_format @advisory.description
.row
.col-md-6
b
= t('activerecord.attributes.advisory.references')
.col-md-6
ul.list-unstyled
- @advisory.references.gsub(/\r| /, '').split("\n").each do |ref|
li
= construct_ref_link(ref)
.row
.col-md-6
b
= t('layout.advisories.build_lists')
.col-md-6
= raw @advisory.build_lists.map{ |bl| link_to bl.id, build_list_path(bl) }.join(', ')
.row
.col-md-6
b
= t('layout.advisories.build_lists')
.col-md-6
.row
= render 'packages_info'

313
app/views/projects/build_lists/show.html.slim
View File

@ -1,313 +0,0 @@
-set_meta_tags title: [title_object(@build_list.project), t('activerecord.models.build_list')]
.build-list{'ng-controller' => 'BuildListController'}
.notify.blue
%div{class: '{{build_list.status_color}}'}
%p {{build_list.human_status | i18n}}
%p{'am-time-ago' => 'build_list.updated_at', title: '{{build_list.updated_at_utc}}'}
.both
=form_for @build_list, url: publish_build_list_path(@build_list), html: { class: :form } do |f|
%h3= t("layout.build_lists.main_data")
.leftlist= t("activerecord.attributes.build_list.container_path")
.rightlist{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISHED}"}
- url = container_url
= link_to url, url
.rightlist{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISH}"}
= t("layout.build_lists.creating")
.both
.leftlist= t("activerecord.attributes.build_list.id")
.rightlist
= @build_list.id
= hidden_field_tag :build_list_id, @build_list.id
.both
.leftlist= t("activerecord.attributes.build_list.user")
.rightlist
= link_to @build_list.user.try(:fullname), @build_list.user
.both
.leftlist= t("activerecord.attributes.build_list.publisher")
.rightlist{'ng-show' => 'build_list.publisher'}
%a{'ng-href' => '{{build_list.publisher.path}}' } {{build_list.publisher.fullname}}
.both
.leftlist= t("activerecord.attributes.build_list.build_for_platform")
.rightlist
- if bfp = @build_list.build_for_platform
= link_to(bfp.name, bfp)
- else
= t("layout.build_lists.platform_deleted")
.both
.leftlist= t("activerecord.attributes.build_list.save_to_repository")
.rightlist
= link_to "#{@build_list.save_to_platform.name}/#{@build_list.save_to_repository.name}", [@build_list.save_to_platform, @build_list.save_to_repository]
.both
.leftlist= t("activerecord.attributes.build_list.include_testing_subrepository")
.rightlist= t("layout.#{@build_list.include_testing_subrepository?}_")
.both
.leftlist= t("activerecord.attributes.build_list.include_repos")
.rightlist= (@build_list.include_repos||[]).map{|r| Repository.where(id: r).first.try(:name)}.join(', ')
.both
.leftlist= t("activerecord.attributes.build_list.update_type")
.rightlist
= f.select :update_type, options_for_select(build_list_classified_update_types,
@build_list.update_type), {}, 'ng-model' => 'build_list.update_type',
'ng-change' => 'updateTypeChanged()', 'ng-show' => 'build_list.can_publish'
%div{'ng-hide' => 'build_list.can_publish'}= @build_list.update_type
.ng-hide{ 'ng-show' => 'update_type_errors' }
.flash_notify
.alert{ 'ng-class' => "{ 'alert-error': update_type_errors }" }
{{ update_type_errors }}
.both
.both
.leftlist= t("activerecord.attributes.build_list.auto_publish_status")
.rightlist= t("layout.build_lists.auto_publish_status.#{@build_list.auto_publish_status}")
.both
.leftlist= t("activerecord.attributes.build_list.auto_create_container")
.rightlist= t("layout.#{@build_list.auto_create_container?}_")
.both
.leftlist= t("activerecord.attributes.build_list.use_cached_chroot")
.rightlist= t("layout.#{@build_list.use_cached_chroot?}_")
.both
.leftlist= t("activerecord.attributes.build_list.use_extra_tests")
.rightlist= t("layout.#{@build_list.use_extra_tests?}_")
.both
.leftlist= t("activerecord.attributes.build_list.save_buildroot")
.rightlist= t("layout.#{@build_list.save_buildroot?}_")
.both
.leftlist= t("activerecord.attributes.build_list.project_version")
.rightlist= link_to @build_list.project_version, tree_path(@build_list.project, @build_list.project_version)
.both
.leftlist= t("diff")
.rightlist= build_list_version_link(@build_list, true)
.both
.leftlist= t("activerecord.attributes.build_list.arch")
.rightlist= @build_list.arch.name
.both
.leftlist= t("activerecord.attributes.build_list.updated_at")
.rightlist {{build_list.updated_at_utc}}
.both
- if @build_list.external_nodes.present?
.leftlist= t("activerecord.attributes.build_list.external_nodes")
.rightlist= I18n.t("layout.build_lists.external_nodes.#{@build_list.external_nodes}")
.both
.leftlist= t("activerecord.attributes.build_list.builder")
.rightlist{'ng-show' => 'build_list.builder'}
%a{'ng-href' => '{{build_list.builder.path}}' } {{build_list.builder.fullname}}
.both
.leftlist= t("activerecord.attributes.build_list.is_circle")
.rightlist= t("layout.#{@build_list.is_circle?}_")
.both
.leftlist= t("activerecord.attributes.build_list.new_core")
.rightlist= t("layout.#{@build_list.new_core?}_")
.both
- if @build_list.extra_build_lists.present? || @build_list.extra_repositories.present?
.leftlist= t("activerecord.attributes.build_list.extra_repositories")
.rightlist
- Repository.where(id: @build_list.extra_repositories).each do |repo|
%p= link_to "#{repo.platform.name}/#{repo.name}", [repo.platform, repo]
- BuildList.where(id: @build_list.extra_build_lists).each do |bl|
%p= link_to "#{bl.id} (#{bl.project.name} - #{bl.arch.name})", bl
.both
- if @build_list.extra_params.present?
.leftlist
%h4.nomargin= t('activerecord.attributes.build_list.extra_params.label')
.rightlist
.both
- @build_list.extra_params.each do |k, v|
.leftlist= t("activerecord.attributes.build_list.extra_params.#{k}")
.rightlist= v
.both
- if @build_list.mass_build_id.present?
.leftlist= t("activerecord.attributes.mass_build_id")
- path = platform_mass_build_path(@build_list.save_to_platform, @build_list.mass_build_id)
.rightlist= link_to @build_list.mass_build.name, path
.both
%div{'ng-show' => 'build_list.advisory'}
.leftlist= t("layout.build_lists.attached_advisory")
.rightlist
%a{'ng-href' => '{{build_list.advisory.path}}' }
{{build_list.advisory.advisory_id}}
.both
%div{'ng-show' => 'build_list.human_duration'}
%br
.leftlist
.rightlist {{build_list.human_duration }}
.both
- if @build_list.save_to_platform.released
#advisory_block{'ng-show' => 'build_list.can_publish && !build_list.advisory'}
.leftlist= label_tag :attach_advisory, t("layout.build_lists.attached_advisory")
.rightlist
= 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(', '))
.both
#advisory_search_block{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'}
%h3= t("layout.advisories.search_by_id")
.leftlist= label_tag :advisory_search, t("layout.advisories.search_hint")
.rightlist
%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)
.both
- I18n.t('layout.advisories.banners').keys.each do |key|
.info{class: key, 'ng-show' => "search_status == '#{key}'"}
%p= t("layout.advisories.banners.#{key}")
#new_advisory_form{'ng-show' => 'attach_advisory == "new"'}
= f.fields_for @build_list.build_advisory do |f|
= render partial: 'advisories/form', locals: {f: f}
#advisory_preview{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'}
%h3= t('activerecord.models.advisory') << ' {{advisory.advisory_id}}'
.leftlist= t('activerecord.attributes.advisory.description')
.rightlist.descr {{advisory.description}}
.both
.leftlist= t('activerecord.attributes.advisory.references')
.rightlist.refs {{advisory.references}}
.both
%div{'ng-hide' => 'build_list.extra_build_lists_published'}
.flash_notify
.alert.alert-error= t('layout.build_lists.publish_with_extra_fail')
.both
- unless @build_list.valid_branch_for_publish?
.flash_notify
.alert.alert-error= t('layout.build_lists.wrong_branch_for_publish_html', branch: @build_list.save_to_repository.publish_builds_only_from_branch)
.both
%div{'ng-show' => 'build_list.can_publish && build_list.can_publish_in_future && !build_list.can_publish_into_repository'}
.flash_notify
.alert.alert-error= t('flash.build_list.not_all_build_lists_success')
.both
- if can?(:cancel, @build_list)
= link_to t("layout.build_lists.cancel"), cancel_build_list_path(@build_list),
method: :put, data: { confirm: t("layout.confirm") }, class: 'button',
'ng-show' => 'build_list.can_cancel'
= submit_tag t('layout.publish_again'),
data: { confirm: t("layout.publish_again_warning") },
name: 'publish',
'ng-show' => "build_list.can_publish && build_list.status == #{BuildList::BUILD_PUBLISHED}"
= submit_tag t("layout.publish"),
data: { confirm: t('layout.build_lists.tests_failed') }, name: 'publish',
'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"),
data: { confirm: t('layout.confirm') }, name: 'publish',
'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),
method: :put, data: { confirm: t("layout.confirm") },
class: 'button',
'ng-show' => 'build_list.can_publish_into_testing'
- if can?(:reject_publish, @build_list)
= link_to t('layout.reject_publish'), reject_publish_build_list_path(@build_list),
method: :put, data: { confirm: t("layout.confirm") },
class: 'button',
'ng-show' => 'build_list.can_reject_publish'
- if can?(:rerun_tests, @build_list)
= link_to t('layout.build_lists.rerun_tests'),
rerun_tests_build_list_path(@build_list),
method: :put,
data: { confirm: t("layout.confirm") },
class: 'button',
'ng-show' => "build_list.status == #{BuildList::TESTS_FAILED} || build_list.status == #{BuildList::SUCCESS}"
- if can?(:create_container, @build_list)
= link_to t("layout.build_lists.create_container"),
create_container_build_list_path(@build_list),
method: :put, data: { confirm: t("layout.confirm") },
class: 'button',
'ng-show' => 'build_list.can_create_container'
- 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: 'button'
- if can_run_dependent_build_lists?(@build_list)
= link_to t('projects.build_lists.dependent_projects.title'),
dependent_projects_build_list_path(@build_list),
class: 'button',
'ng-show' => 'build_list.dependent_projects_exists'
%div{'ng-show' => "build_list.status == #{BuildList::BUILD_STARTED}"}
= render 'shared/log', { build_started: true, get_log_path: log_build_list_path(@build_list) }
.hr
%h3= t("layout.build_lists.items_header")
%h4.nomargin{'ng-hide' => 'build_list.item_groups'}
= t("layout.build_lists.no_items_data")
%div{'ng-repeat' => 'group in build_list.item_groups'}
%div{'ng-repeat' => 'item in group'}
%h4.nomargin {{item.name + ' #' + item.level}}
%table.tablesorter.width565{cellpadding: "0", cellspacing: "0"}
%thead
%tr
%th= t("activerecord.attributes.build_list/item.name")
%th= t("activerecord.attributes.build_list/item.version")
%th= t("activerecord.attributes.build_list/item.status")
%tbody
%tr{class: "{{build_list.itemStatusColor(item.status)}}"}
%td {{item.name}}
%td
%a{'ng-href' => '{{item.path.href}}' } {{item.path.text}}
%td {{build_list.humanStatus(item.status) | i18n}}
.both
%div{'ng-show' => 'build_list.packages'}
.hr
%h3= t('layout.build_lists.packages_header')
%table.tablesorter.width565{cellpadding: "0", cellspacing: "0"}
%thead
%tr
%th= t("activerecord.attributes.build_list/package.fullname")
%th= t("activerecord.attributes.build_list/package.name")
%th= t("activerecord.attributes.build_list/package.epoch")
%th= t("activerecord.attributes.build_list/package.version")
%th= t("activerecord.attributes.build_list/package.release")
%tbody
%tr{'ng-repeat-start' => 'package in build_list.packages'}
%td.package
%a.expand{'ng-show' => 'package.dependent_projects' }
%span.icon-chevron-up{'ng-show' => 'package.show_dependent_projects',
'ng-click' => 'package.show_dependent_projects = false' }
%span.icon-chevron-down{'ng-hide' => 'package.show_dependent_projects',
'ng-click' => 'package.show_dependent_projects = true' }
%div{'ng-if' => '!package.url'} {{package.fullname}}
%a{ 'ng-if' => 'package.url',
'ng-href' => "{{package.url}}" }
{{package.fullname}}
%td {{package.name}}
%td {{package.epoch}}
%td {{package.version}}
%td {{package.release}}
%tr{'ng-repeat-end' => '',
'ng-show' => 'package.show_dependent_projects',
'ng-repeat' => 'project in package.dependent_projects' }
%td
%a{'ng-href' => "{{project.url}}" } {{project.name}}
%td
%p{'ng-repeat' => 'package in project.dependent_packages'}
{{package}}
%td{ colspan: 3 }
%a{'ng-href' => '{{project.new_url}}' }
= t('layout.build_lists.create_build_list')
.both
- if @build_list.new_core?
.hr
= render 'shared/build_results', subject: @build_list
:javascript
$('article .all').addClass('bigpadding');
= render 'submenu'