#751: open logs of (Product)BuildList in new window

This commit is contained in:
Vokhmin Alexey V 2012-12-04 19:20:59 +04:00
parent d39c07475f
commit b4472a1403
2 changed files with 6 additions and 2 deletions

View File

@ -12,7 +12,11 @@
- pbl.results.each do |item|
%tr
- sha1 = item['sha1']
%td= link_to item['file_name'], "http://file-store.rosalinux.ru/api/v1/file_stores/#{sha1}"
- filename = item['file_name']
- url = 'http://file-store.rosalinux.ru/api/v1/file_stores/'
- url << sha1
- url << '.log?show=true' if filename =~ /.*\.(log|txt)$/
%td= link_to filename, url
%td= sha1
%td= item['size']
.both

View File

@ -127,7 +127,7 @@
var r = new Rosa.Routers.BuildListsAdvisoriesRouter();
});
- if BuildList::HUMAN_STATUSES[@build_list.status].in? [:build_started, :build_error, :success]
- if BuildList::HUMAN_STATUSES[@build_list.status].in?([:build_started, :build_error, :success]) && (!@build_list.new_core? || @build_list.build_started?)
- log_params = { :build_started => @build_list.build_started?, :get_log_path => log_build_list_path(@build_list) }
= render 'shared/log', ( @build_list.new_core? ? log_params : log_params.merge({:download_log_url => build_list_log_url(:build)}) )