#921 modify task monitoring page
This commit is contained in:
parent
e248f4175d
commit
d585978550
|
@ -1765,4 +1765,17 @@ table#myTable thead tr.search th form.button_to div input {
|
|||
|
||||
.CodeMirror {
|
||||
border: 1px solid #DDDDDD;
|
||||
}
|
||||
}
|
||||
|
||||
table.tablesorter th.lpadding6 {
|
||||
padding-left: 6px;
|
||||
}
|
||||
|
||||
div.right.slim {
|
||||
padding-right: 5px;
|
||||
width: 705px;
|
||||
|
||||
table.tablesorter {
|
||||
font-size: 10px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@ module BuildListsHelper
|
|||
else
|
||||
''
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def build_list_version_link(bl, str_version = false)
|
||||
hash_size=5
|
||||
|
@ -94,4 +94,9 @@ module BuildListsHelper
|
|||
def log_reload_lines_options
|
||||
options_for_select([100, 200, 500, 1000, 1500, 2000], 1000).html_safe
|
||||
end
|
||||
|
||||
def get_version_release build_list
|
||||
pkg = build_list.packages.where(:package_type => 'source', :project_id => build_list.project_id).first
|
||||
"#{pkg.version}-#{pkg.release}" if pkg.present?
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
%td= build_list_version_link(build_list)
|
||||
- else
|
||||
%td.centered{:colspan => 2}= t("layout.projects.unexisted_project")
|
||||
%td= link_to "#{build_list.save_to_platform.name}/#{build_list.save_to_repository.name}", [build_list.save_to_platform, build_list.save_to_repository]
|
||||
%td= get_version_release build_list
|
||||
-build_for=" (#{build_list.build_for_platform.name})" if build_list.build_for_platform.personal?
|
||||
%td= link_to "#{build_list.save_to_platform.name}/#{build_list.save_to_repository.name}#{build_for}", [build_list.save_to_platform, build_list.save_to_repository]
|
||||
%td= build_list.arch.try(:name) || t("layout.arches.unexisted_arch")
|
||||
%td= link_to build_list.user.try(:fullname), build_list.user
|
||||
|
|
|
@ -14,8 +14,9 @@
|
|||
%th.lpadding16= t("activerecord.attributes.build_list.status")
|
||||
%th.lpadding16= t("activerecord.attributes.build_list.project")
|
||||
%th.lpadding16= t("diff")
|
||||
%th.lpadding16= t("activerecord.attributes.build_list.project_version")
|
||||
%th.lpadding16= t("activerecord.attributes.build_list.save_to_repository")
|
||||
%th.lpadding16= t("activerecord.attributes.build_list.arch")
|
||||
%th.lpadding6= t("activerecord.attributes.build_list.arch_short")
|
||||
%th.lpadding16= t("activerecord.attributes.build_list.user")
|
||||
%tbody= render :partial => 'projects/build_lists/build_list', :collection => @build_lists
|
||||
.both
|
||||
|
|
|
@ -12,6 +12,7 @@ en:
|
|||
project_id: Project
|
||||
project: Project
|
||||
arch_id: Architecture
|
||||
arch_short: Arch
|
||||
arch: Architecture
|
||||
new_core: New core
|
||||
is_circle: Recurrent build
|
||||
|
|
|
@ -13,6 +13,7 @@ ru:
|
|||
project: Проект
|
||||
arch_id: Архитектура
|
||||
arch: Архитектура
|
||||
arch_short: Архит-ра
|
||||
new_core: Новое ядро
|
||||
is_circle: Циклическая сборка
|
||||
updated_at: Информация получена
|
||||
|
|
Loading…
Reference in New Issue