#631: fixed misprint
This commit is contained in:
parent
4d1166e6b3
commit
71d14e43d6
|
@ -55,7 +55,7 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
function checkAccessToAutomatedPublising() {
|
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');
|
$('#build_list_auto_publish').removeAttr('disabled').attr('checked', 'checked');
|
||||||
//enableUpdateTypes();
|
//enableUpdateTypes();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -49,7 +49,7 @@ class Projects::BuildListsController < Projects::BaseController
|
||||||
@repository = @project.repositories.where(:id => @platform.repository_ids).first
|
@repository = @project.repositories.where(:id => @platform.repository_ids).first
|
||||||
|
|
||||||
params[:build_list][:save_to_repository_id] = @repository.id
|
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|
|
Arch.where(:id => params[:arches]).each do |arch|
|
||||||
Platform.main.where(:id => params[:build_for_platforms]).each do |build_for_platform|
|
Platform.main.where(:id => params[:build_for_platforms]).each do |build_for_platform|
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
.leftlist= f.label :description, t("activerecord.attributes.repository.description"), :class => :label
|
.leftlist= f.label :description, t("activerecord.attributes.repository.description"), :class => :label
|
||||||
.rightlist= f.text_field :description, :class => 'text_field'
|
.rightlist= f.text_field :description, :class => 'text_field'
|
||||||
|
|
||||||
.leftlist= f.label :publish_wtihout_qa, t("activerecord.attributes.repository.publish_wtihout_qa"), :class => :label
|
.leftlist= f.label :publish_without_qa, t("activerecord.attributes.repository.publish_without_qa"), :class => :label
|
||||||
.rightlist= f.check_box :publish_wtihout_qa, :class => 'check_box'
|
.rightlist= f.check_box :publish_without_qa, :class => 'check_box'
|
||||||
|
|
||||||
.both
|
.both
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- platform.repositories.each do |repo|
|
- platform.repositories.each do |repo|
|
||||||
.both
|
.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
|
= label_tag "include_repos_#{repo.id}", repo.name
|
||||||
|
|
|
@ -46,7 +46,7 @@ en:
|
||||||
repository:
|
repository:
|
||||||
name: Name
|
name: Name
|
||||||
description: Description
|
description: Description
|
||||||
publish_wtihout_qa: Publication after release
|
publish_without_qa: Publication after release
|
||||||
platform_id: Platform
|
platform_id: Platform
|
||||||
platform: Platform
|
platform: Platform
|
||||||
created_at: Created
|
created_at: Created
|
||||||
|
|
|
@ -46,7 +46,7 @@ ru:
|
||||||
repository:
|
repository:
|
||||||
name: Название
|
name: Название
|
||||||
description: Описание
|
description: Описание
|
||||||
publish_wtihout_qa: Публикация после релиза
|
publish_without_qa: Публикация после релиза
|
||||||
platform_id: Платформа
|
platform_id: Платформа
|
||||||
platform: Платформа
|
platform: Платформа
|
||||||
created_at: Создан
|
created_at: Создан
|
||||||
|
|
|
@ -8,12 +8,12 @@ class AddPublishWtihoutQaToRepositories < ActiveRecord::Migration
|
||||||
end
|
end
|
||||||
|
|
||||||
def up
|
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).
|
Repository.where('platforms.released is true').joins(:platform).
|
||||||
update_all(:publish_wtihout_qa => false)
|
update_all(:publish_without_qa => false)
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
remove_column :repositories, :publish_wtihout_qa
|
remove_column :repositories, :publish_without_qa
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -372,7 +372,7 @@ ActiveRecord::Schema.define(:version => 20120906115648) do
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.string "name", :null => false
|
t.string "name", :null => false
|
||||||
t.boolean "publish_wtihout_qa", :default => true
|
t.boolean "publish_without_qa", :default => true
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "settings_notifiers", :force => true do |t|
|
create_table "settings_notifiers", :force => true do |t|
|
||||||
|
|
Loading…
Reference in New Issue