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

Bugfixes

This commit is contained in:
Wedge 2016-05-04 18:58:34 +03:00
parent 92026a09a0
commit 519e590c69
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb
View File

@ -15,7 +15,7 @@ function($scope, BuildListsService, $location, $interval, $uibModal) {
if(refresh) { if(refresh) {
$interval.cancel(refresh); $interval.cancel(refresh);
} }
refresh = $interval($scope.getBuildLists, 60000); refresh = $interval(function() { $scope.getBuildLists() }, 60000);
} }
else if(!autoreload && refresh) { else if(!autoreload && refresh) {
$interval.cancel(refresh); $interval.cancel(refresh);

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

@ -84,8 +84,7 @@ class Projects::BuildListsController < Projects::BaseController
else else
BuildList.where(id: build_lists.map(&:id)).update_all(group_id: build_lists[0].id) if build_lists.size > 1 BuildList.where(id: build_lists.map(&:id)).update_all(group_id: build_lists[0].id) if build_lists.size > 1
flash[:notice] = notices.join('<br>').html_safe flash[:notice] = notices.join('<br>').html_safe
puts root_path(anchor: "project=" + @project.name_with_owner) redirect_to project_build_lists_path(@project.name_with_owner)
redirect_to root_path(anchor: "?project=" + @project.name_with_owner)
end end
end end

4
app/views/projects/build_lists/new_build/_new_form.html.haml
View File

@ -49,8 +49,8 @@
= hidden_field_tag :from_build_list_id, params[:build_list_id] if params[:build_list_id].present? = hidden_field_tag :from_build_list_id, params[:build_list_id] if params[:build_list_id].present?
.col-xs-12.col-sm-8.col-sm-offset-2 .row.top-space
%hr .pull-right
= button_tag type: :submit, = button_tag type: :submit,
data: {'disable-with' => t('layout.processing')}, data: {'disable-with' => t('layout.processing')},
class: 'btn btn-primary btn-lg btn-block' do class: 'btn btn-primary btn-lg btn-block' do