Merge branch 'master' of github.com:warpc/rosa-build

This commit is contained in:
Vladimir Sharshov 2012-05-28 23:28:09 +04:00
commit f8edecc915
4 changed files with 6 additions and 2 deletions

View File

@ -17,14 +17,14 @@ class Platforms::PlatformsController < Platforms::BaseController
if mass_build.save
redirect_to(mass_builds_platform_path(@platform), :notice => t("flash.platform.build_all_success"))
else
@mass_builds = MassBuild.paginate(:page => params[:page], :per_page => 20)
@mass_builds = MassBuild.by_platform(@platform).order('created_at DESC').paginate(:page => params[:page], :per_page => 20)
flash[:warning] = mass_build.errors.full_messages.join('. ')
flash[:error] = t("flash.platform.build_all_error")
end
end
def mass_builds
@mass_builds = MassBuild.paginate(:page => params[:page], :per_page => 20)
@mass_builds = MassBuild.by_platform(@platform).order('created_at DESC').paginate(:page => params[:page], :per_page => 20)
render :action => :build_all
end

View File

@ -28,6 +28,7 @@
%table.tablesorter.unbordered
%thead
%tr
%th.lpadding16= t('activerecord.attributes.mass_build.id')
%th.lpadding16= t('activerecord.attributes.mass_build.name')
%th.lpadding16= t('activerecord.attributes.mass_build.arch_names')
%th.lpadding16= t('activerecord.attributes.mass_build.user')
@ -35,6 +36,7 @@
%th.lpadding16= t('activerecord.attributes.mass_build.created_at')
- @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.arch_names
%td= link_to mass_build.user.fullname, mass_build.user

View File

@ -7,6 +7,7 @@ en:
mass_build: Mass Build
attributes:
mass_build:
id: Id
name: Name
created_at: Created
updated_at: Updated

View File

@ -7,6 +7,7 @@ ru:
mass_build: Массовая Сборка
attributes:
mass_build:
id: Id
name: Название
created_at: Создан
updated_at: Обновлен