From 45ff187875723077f61bb35b3fb5d9d7a2d8a499 Mon Sep 17 00:00:00 2001 From: "konstantin.grabar" Date: Wed, 23 May 2012 20:44:04 +0400 Subject: [PATCH] [refs #442] Remove button. Add tab. Fix locales. Fix schema --- app/views/platforms/base/_sidebar.html.haml | 2 ++ app/views/platforms/platforms/show.html.haml | 2 -- config/locales/models/build_list.en.yml | 2 +- config/locales/models/build_list.ru.yml | 2 +- config/locales/models/platform.en.yml | 2 +- db/schema.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/platforms/base/_sidebar.html.haml b/app/views/platforms/base/_sidebar.html.haml index f7d587fa5..eaa4c6eeb 100644 --- a/app/views/platforms/base/_sidebar.html.haml +++ b/app/views/platforms/base/_sidebar.html.haml @@ -10,6 +10,8 @@ = link_to t("layout.platforms.about"), platform_path(@platform) %li{:class => (contr == :repositories) ? 'active' : ''} = link_to t("layout.repositories.list_header"), platform_repositories_path(@platform) + - if can? :mass_builds, @platform + %li= link_to t("layout.platforms.mass_build"), mass_builds_platform_path(@platform) - if can? :read, @platform.products.build %li{:class => (contr == :products) ? 'active' : ''} = link_to t("layout.products.list_header"), platform_products_path(@platform) diff --git a/app/views/platforms/platforms/show.html.haml b/app/views/platforms/platforms/show.html.haml index 93e368d08..0461c86d6 100644 --- a/app/views/platforms/platforms/show.html.haml +++ b/app/views/platforms/platforms/show.html.haml @@ -30,8 +30,6 @@ %td= @platform.distrib_type .buttons_block - - if can? :mass_builds, @platform - = link_to t("layout.platforms.mass_build"), mass_builds_platform_path(@platform), :class => "button left_floated" = link_to I18n.t("layout.platforms.clone"), clone_platform_path(@platform), :class => "button left_floated" if can? :clone, @platform = render 'connection_info' if @platform.platform_type == 'personal' and @platform.visibility == 'open' diff --git a/config/locales/models/build_list.en.yml b/config/locales/models/build_list.en.yml index 3537a51d4..4e2119e10 100644 --- a/config/locales/models/build_list.en.yml +++ b/config/locales/models/build_list.en.yml @@ -28,7 +28,7 @@ en: preferences: Preferences started_at: Build started at duration: Build duration in seconds - mass_build_id: Mass Build + mass_build_id: Mass build build_list/item: name: Name diff --git a/config/locales/models/build_list.ru.yml b/config/locales/models/build_list.ru.yml index 42d0b29a0..0863cd991 100644 --- a/config/locales/models/build_list.ru.yml +++ b/config/locales/models/build_list.ru.yml @@ -27,7 +27,7 @@ ru: user: Пользователь preferences: Настройки duration: Длительность билда в секундах - mass_build_id: Массовая Сборка + mass_build_id: Массовая сборка build_list/item: name: Название diff --git a/config/locales/models/platform.en.yml b/config/locales/models/platform.en.yml index 5ac03e1ef..bba971e98 100644 --- a/config/locales/models/platform.en.yml +++ b/config/locales/models/platform.en.yml @@ -42,7 +42,7 @@ en: members: Members project: Project arch: Architecture - mass_build: Mass Build + mass_build: Mass build build_task: Build Task refresh_button: Refresh diff --git a/db/schema.rb b/db/schema.rb index dc260d5e9..5ed652d33 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -233,7 +233,7 @@ ActiveRecord::Schema.define(:version => 20120523113925) do t.string "owner_type" t.string "visibility", :default => "open", :null => false t.string "platform_type", :default => "main", :null => false - t.string "distrib_type" + t.string "distrib_type", :null => false end add_index "platforms", ["name"], :name => "index_platforms_on_name", :unique => true, :case_sensitive => false