[refs #442] Change mass builds table

app/assets/stylesheets/design/custom.scss

@@ -1085,3 +1085,7 @@ form.mass_build section.right {
   overflow: hidden;
   padding-top: 10px;
 }
+
+.min_width_120 {
+  min-width: 120px;
+}

app/controllers/platforms/platforms_controller.rb

@@ -31,9 +31,9 @@ class Platforms::PlatformsController < Platforms::BaseController
     render :action => :build_all
   end
 
-  def get_failed_builds_list
+  def failed_builds_list
     @mass_build = MassBuild.find params[:mass_build_id]
-    send_file @mass_build.generate_failed_builds_list, :filename => "mass_build_#{@mass_build.id}"
+    render :text => @mass_build.generate_failed_builds_list
   end
 
   def index

app/views/platforms/platforms/build_all.html.haml

@@ -30,25 +30,35 @@
     %tr
       %th.lpadding16= t('activerecord.attributes.mass_build.id')
       %th.lpadding16= t('activerecord.attributes.mass_build.name')
-      %th.lpadding16= t("layout.build_lists.all").camelize
+      %th.lpadding16= t("layout.mass_builds.statuses")
-      %th.lpadding16= t("layout.build_lists.statuses.build_published").camelize
+      %th.lpadding16= t("layout.mass_builds.failed_builds_list")
-      %th.lpadding16= t("layout.build_lists.statuses.build_pending").camelize
-      %th.lpadding16= t("layout.build_lists.statuses.build_started").camelize
-      %th.lpadding16= t("layout.build_lists.statuses.build_publish").camelize
-      %th.lpadding16= t("layout.build_lists.statuses.build_error").camelize
       %th.lpadding16= t("layout.mass_builds.extended_data")
   - @mass_builds.each do |mass_build|
     %tr
       %td= mass_build.id
       %td= link_to mass_build.name, build_lists_path(:filter => {:mass_build_id => mass_build.id})
-      %td= mass_build.build_lists_count
+      %td.min_width_120
-      %td= mass_build.build_published_count
+        = t("layout.build_lists.all") + ": "
-      %td= mass_build.build_pending_count
+        = mass_build.build_lists_count
-      %td= mass_build.build_started_count
+        .both
-      %td= mass_build.build_publish_count
+        = t("layout.build_lists.statuses.build_published") + ": "
-      %td= mass_build.build_error_count
+        = mass_build.build_published_count
+        .both
+        = t("layout.build_lists.statuses.build_pending") + ": "
+        = mass_build.build_pending_count
+        .both
+        = t("layout.build_lists.statuses.build_started") + ": "
+        = mass_build.build_started_count
+        .both
+        = t("layout.build_lists.statuses.build_publish") + ": "
+        = mass_build.build_publish_count
+        .both
+        = t("layout.build_lists.statuses.build_error") + ": "
+        = mass_build.build_error_count
+        .both
+      %td= link_to t("layout.mass_builds.failed_builds_list"), failed_builds_list_platforms_path(:mass_build_id => mass_build.id), :target => "_blank"
       %td
-        %a{:href => '#', :'data-toggle' => "collapse", :'data-target' => "#collapse_#{ mass_build.id }"}= t("layout.mass_builds.extended_data")
+        %a{:href => "collapse_#{ mass_build.id }", :'data-toggle' => "collapse", :'data-target' => "#collapse_#{ mass_build.id }"}= t("layout.mass_builds.extended_data")
         .in.collapse{:id => "collapse_#{ mass_build.id }"}
           = t('activerecord.attributes.mass_build.arch_names') + ": "
           = mass_build.arch_names

config/locales/models/mass_build.en.yml

@@ -3,6 +3,8 @@ en:
     mass_builds:
       repositories: Repositories
       extended_data: Extended data
+      failed_builds_list: Failed Builds List
+      statuses: Statuses
   activerecord:
     models:
       mass_build: Mass Build

config/locales/models/mass_build.ru.yml

@@ -3,6 +3,8 @@ ru:
     mass_builds:
       repositories: Репозитории
       extended_data: Параметры задания
+      failed_builds_list: Список ошибок сборок
+      statuses: Статусы
   activerecord:
     models:
       mass_build: Массовая Сборка

config/routes.rb

@@ -55,6 +55,9 @@ Rosa::Application.routes.draw do
         get    :mass_builds
         get    :advisories
       end
+      collection do
+        get    :failed_builds_list
+      end
       get :autocomplete_user_uname, :on => :collection
       resources :repositories do
         member do

db/schema.rb

@@ -209,6 +209,7 @@ ActiveRecord::Schema.define(:version => 20120622092725) do
     t.integer  "build_pending_count",   :default => 0
     t.integer  "build_started_count",   :default => 0
     t.integer  "build_publish_count",   :default => 0
+    t.integer  "build_error_count",     :default => 0
   end
 
   create_table "platforms", :force => true do |t|