From 71d14e43d6b1869a310f36578deba059c768a1c4 Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Thu, 6 Sep 2012 19:39:26 +0400 Subject: [PATCH] #631: fixed misprint --- app/assets/javascripts/extra/build_list.js | 2 +- app/controllers/projects/build_lists_controller.rb | 2 +- app/views/platforms/repositories/_form.html.haml | 4 ++-- app/views/projects/build_lists/_include_repos.html.haml | 2 +- config/locales/models/repository.en.yml | 2 +- config/locales/models/repository.ru.yml | 2 +- ...20120906115648_add_publish_wtihout_qa_to_repositories.rb | 6 +++--- db/schema.rb | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/extra/build_list.js b/app/assets/javascripts/extra/build_list.js index 9f4fc5793..89fecddd8 100644 --- a/app/assets/javascripts/extra/build_list.js +++ b/app/assets/javascripts/extra/build_list.js @@ -55,7 +55,7 @@ $(document).ready(function() { }); function checkAccessToAutomatedPublising() { - if ($('.all_platforms .offset25 input:checked[publish_wtihout_qa="1"]').length > 0) { + if ($('.all_platforms .offset25 input:checked[publish_without_qa="1"]').length > 0) { $('#build_list_auto_publish').removeAttr('disabled').attr('checked', 'checked'); //enableUpdateTypes(); } else { diff --git a/app/controllers/projects/build_lists_controller.rb b/app/controllers/projects/build_lists_controller.rb index 77bf59daa..b6ffb8cba 100644 --- a/app/controllers/projects/build_lists_controller.rb +++ b/app/controllers/projects/build_lists_controller.rb @@ -49,7 +49,7 @@ class Projects::BuildListsController < Projects::BaseController @repository = @project.repositories.where(:id => @platform.repository_ids).first params[:build_list][:save_to_repository_id] = @repository.id - params[:build_list][:auto_publish] = false unless @repository.publish_wtihout_qa? + params[:build_list][:auto_publish] = false unless @repository.publish_without_qa? Arch.where(:id => params[:arches]).each do |arch| Platform.main.where(:id => params[:build_for_platforms]).each do |build_for_platform| diff --git a/app/views/platforms/repositories/_form.html.haml b/app/views/platforms/repositories/_form.html.haml index 7c5a9c5c4..065e99e24 100644 --- a/app/views/platforms/repositories/_form.html.haml +++ b/app/views/platforms/repositories/_form.html.haml @@ -5,8 +5,8 @@ .leftlist= f.label :description, t("activerecord.attributes.repository.description"), :class => :label .rightlist= f.text_field :description, :class => 'text_field' -.leftlist= f.label :publish_wtihout_qa, t("activerecord.attributes.repository.publish_wtihout_qa"), :class => :label -.rightlist= f.check_box :publish_wtihout_qa, :class => 'check_box' +.leftlist= f.label :publish_without_qa, t("activerecord.attributes.repository.publish_without_qa"), :class => :label +.rightlist= f.check_box :publish_without_qa, :class => 'check_box' .both diff --git a/app/views/projects/build_lists/_include_repos.html.haml b/app/views/projects/build_lists/_include_repos.html.haml index 95a63c60c..429f4c7c1 100644 --- a/app/views/projects/build_lists/_include_repos.html.haml +++ b/app/views/projects/build_lists/_include_repos.html.haml @@ -1,4 +1,4 @@ - platform.repositories.each do |repo| .both - = check_box_tag "build_list[include_repos][]", repo.id, repo.name == 'main' || @project.repositories.map(&:id).include?(repo.id), :id => "include_repos_#{repo.id}", :save_to_platform_id => platform.id, :rep_name => repo.name, :publish_wtihout_qa => repo.publish_wtihout_qa? ? 1 : 0 + = check_box_tag "build_list[include_repos][]", repo.id, repo.name == 'main' || @project.repositories.map(&:id).include?(repo.id), :id => "include_repos_#{repo.id}", :save_to_platform_id => platform.id, :rep_name => repo.name, :publish_without_qa => repo.publish_without_qa? ? 1 : 0 = label_tag "include_repos_#{repo.id}", repo.name diff --git a/config/locales/models/repository.en.yml b/config/locales/models/repository.en.yml index a1778bb60..1c3082a9e 100644 --- a/config/locales/models/repository.en.yml +++ b/config/locales/models/repository.en.yml @@ -46,7 +46,7 @@ en: repository: name: Name description: Description - publish_wtihout_qa: Publication after release + publish_without_qa: Publication after release platform_id: Platform platform: Platform created_at: Created diff --git a/config/locales/models/repository.ru.yml b/config/locales/models/repository.ru.yml index b0abe1d3d..96caae49f 100644 --- a/config/locales/models/repository.ru.yml +++ b/config/locales/models/repository.ru.yml @@ -46,7 +46,7 @@ ru: repository: name: Название description: Описание - publish_wtihout_qa: Публикация после релиза + publish_without_qa: Публикация после релиза platform_id: Платформа platform: Платформа created_at: Создан diff --git a/db/migrate/20120906115648_add_publish_wtihout_qa_to_repositories.rb b/db/migrate/20120906115648_add_publish_wtihout_qa_to_repositories.rb index f9a7cac11..b7308115f 100644 --- a/db/migrate/20120906115648_add_publish_wtihout_qa_to_repositories.rb +++ b/db/migrate/20120906115648_add_publish_wtihout_qa_to_repositories.rb @@ -8,12 +8,12 @@ class AddPublishWtihoutQaToRepositories < ActiveRecord::Migration end def up - add_column :repositories, :publish_wtihout_qa, :boolean, :default => true + add_column :repositories, :publish_without_qa, :boolean, :default => true Repository.where('platforms.released is true').joins(:platform). - update_all(:publish_wtihout_qa => false) + update_all(:publish_without_qa => false) end def down - remove_column :repositories, :publish_wtihout_qa + remove_column :repositories, :publish_without_qa end end diff --git a/db/schema.rb b/db/schema.rb index 6c06c434c..e9375ad5d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -372,7 +372,7 @@ ActiveRecord::Schema.define(:version => 20120906115648) do t.datetime "created_at" t.datetime "updated_at" t.string "name", :null => false - t.boolean "publish_wtihout_qa", :default => true + t.boolean "publish_without_qa", :default => true end create_table "settings_notifiers", :force => true do |t|