Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #840 from warpc/839-enable-new_core-for-main-platforms 

[refs #839]: enable new_core for all platforms
This commit is contained in:
Vladimir Sharshov 2013-01-17 03:06:00 -08:00
parent 3dd553b2dd 318007751c
commit e48cc6ea9d
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/extra/build_list.js
View File

@ -10,12 +10,9 @@ $(document).ready(function() {
var all_repositories = $('.all_platforms input'); var all_repositories = $('.all_platforms input');
all_repositories.removeAttr('checked'); all_repositories.removeAttr('checked');
var new_core = $('#build_list_new_core');
if (build_platform.size() == 0) { if (build_platform.size() == 0) {
all_repositories.removeAttr('disabled'); all_repositories.removeAttr('disabled');
new_core.removeAttr('disabled').attr('checked', 'checked');
} else { } else {
new_core.removeAttr('checked').attr('disabled', 'disabled');
all_repositories.attr('disabled', 'disabled'); all_repositories.attr('disabled', 'disabled');
var parent = build_platform.parent(); var parent = build_platform.parent();
parent.find('input').removeAttr('disabled'); parent.find('input').removeAttr('disabled');

1
app/controllers/api/v1/build_lists_controller.rb
View File

@ -26,7 +26,6 @@ class Api::V1::BuildListsController < Api::V1::BaseController
@build_list.user = current_user @build_list.user = current_user
@build_list.priority = current_user.build_priority # User builds more priority than mass rebuild with zero priority @build_list.priority = current_user.build_priority # User builds more priority than mass rebuild with zero priority
@build_list.new_core = save_to_repository.platform.personal? && bl_params[:new_core] == '1'
if @build_list.save if @build_list.save
render :action => 'show' render :action => 'show'

2
app/controllers/projects/build_lists_controller.rb
View File

@ -55,14 +55,12 @@ class Projects::BuildListsController < Projects::BaseController
build_for_platforms = Repository.select(:platform_id). build_for_platforms = Repository.select(:platform_id).
where(:id => params[:build_list][:include_repos]).group(:platform_id).map(&:platform_id) where(:id => params[:build_list][:include_repos]).group(:platform_id).map(&:platform_id)
new_core = @platform.personal? && params[:build_list][:new_core] == '1'
Arch.where(:id => params[:arches]).each do |arch| Arch.where(:id => params[:arches]).each do |arch|
Platform.main.where(:id => build_for_platforms).each do |build_for_platform| Platform.main.where(:id => build_for_platforms).each do |build_for_platform|
@build_list = @project.build_lists.build(params[:build_list]) @build_list = @project.build_lists.build(params[:build_list])
@build_list.build_for_platform = build_for_platform; @build_list.arch = arch; @build_list.user = current_user @build_list.build_for_platform = build_for_platform; @build_list.arch = arch; @build_list.user = current_user
@build_list.include_repos = @build_list.include_repos.select {|ir| @build_list.build_for_platform.repository_ids.include? ir.to_i} @build_list.include_repos = @build_list.include_repos.select {|ir| @build_list.build_for_platform.repository_ids.include? ir.to_i}
@build_list.priority = current_user.build_priority # User builds more priority than mass rebuild with zero priority @build_list.priority = current_user.build_priority # User builds more priority than mass rebuild with zero priority
@build_list.new_core = new_core
flash_options = {:project_version => @build_list.project_version, :arch => arch.name, :build_for_platform => build_for_platform.name} flash_options = {:project_version => @build_list.project_version, :arch => arch.name, :build_for_platform => build_for_platform.name}
if @build_list.save if @build_list.save