Display validation errors when admin edits a runner

This commit is contained in:
Grzegorz Bizon 2016-05-18 17:23:26 +02:00
parent bf9cc351c2
commit 52ba3a2d05
2 changed files with 17 additions and 11 deletions

View file

@ -9,19 +9,13 @@ class Admin::RunnersController < Admin::ApplicationController
end end
def show def show
@builds = @runner.builds.order('id DESC').first(30) set_builds_and_projects
@projects =
if params[:search].present?
::Project.search(params[:search])
else
Project.all
end
@projects = @projects.where.not(id: @runner.projects.select(:id)) if @runner.projects.any?
@projects = @projects.page(params[:page]).per(30)
end end
def update def update
@runner.update_attributes(runner_params) unless @runner.update_attributes(runner_params)
set_builds_and_projects and return render 'show'
end
respond_to do |format| respond_to do |format|
format.js format.js
@ -60,4 +54,16 @@ class Admin::RunnersController < Admin::ApplicationController
def runner_params def runner_params
params.require(:runner).permit(Ci::Runner::FORM_EDITABLE) params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
end end
def set_builds_and_projects
@builds = runner.builds.order('id DESC').first(30)
@projects =
if params[:search].present?
::Project.search(params[:search])
else
Project.all
end
@projects = @projects.where.not(id: runner.projects.select(:id)) if runner.projects.any?
@projects = @projects.page(params[:page]).per(30)
end
end end

View file

@ -1,5 +1,5 @@
= form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f| = form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
= form_errors(@runner) = form_errors(runner)
.form-group .form-group
= label :active, "Active", class: 'control-label' = label :active, "Active", class: 'control-label'
.col-sm-10 .col-sm-10