From 87f510858b2d59415096f3bd9180e23700139e38 Mon Sep 17 00:00:00 2001 From: Wedge Date: Wed, 4 May 2016 18:58:34 +0300 Subject: [PATCH] Bugfixes --- .../angularjs/build_lists/build_lists_controller.js.erb | 2 +- app/controllers/projects/build_lists_controller.rb | 3 +-- app/views/projects/build_lists/new_build/_new_form.html.haml | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb b/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb index a68b00671..eb6b8d0ce 100644 --- a/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb +++ b/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb @@ -15,7 +15,7 @@ function($scope, BuildListsService, $location, $interval, $uibModal) { if(refresh) { $interval.cancel(refresh); } - refresh = $interval($scope.getBuildLists, 60000); + refresh = $interval(function() { $scope.getBuildLists() }, 60000); } else if(!autoreload && refresh) { $interval.cancel(refresh); diff --git a/app/controllers/projects/build_lists_controller.rb b/app/controllers/projects/build_lists_controller.rb index 89f824681..4197e04d9 100644 --- a/app/controllers/projects/build_lists_controller.rb +++ b/app/controllers/projects/build_lists_controller.rb @@ -84,8 +84,7 @@ class Projects::BuildListsController < Projects::BaseController else BuildList.where(id: build_lists.map(&:id)).update_all(group_id: build_lists[0].id) if build_lists.size > 1 flash[:notice] = notices.join('
').html_safe - puts root_path(anchor: "project=" + @project.name_with_owner) - redirect_to root_path(anchor: "?project=" + @project.name_with_owner) + redirect_to project_build_lists_path(@project.name_with_owner) end end diff --git a/app/views/projects/build_lists/new_build/_new_form.html.haml b/app/views/projects/build_lists/new_build/_new_form.html.haml index ee762feb9..6cc11788e 100644 --- a/app/views/projects/build_lists/new_build/_new_form.html.haml +++ b/app/views/projects/build_lists/new_build/_new_form.html.haml @@ -49,8 +49,8 @@ = 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 - %hr + .row.top-space + .pull-right = button_tag type: :submit, data: {'disable-with' => t('layout.processing')}, class: 'btn btn-primary btn-lg btn-block' do