GitLab steht Mittwoch, den 23. September, zwischen 10:00 und 12:00 Uhr aufgrund von Wartungsarbeiten nicht zur Verfügung.

Commit 52ba3a2d authored by Grzegorz Bizon's avatar Grzegorz Bizon

Display validation errors when admin edits a runner

parent bf9cc351
......@@ -9,19 +9,13 @@ class Admin::RunnersController < Admin::ApplicationController
end
def show
@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)
set_builds_and_projects
end
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|
format.js
......@@ -60,4 +54,16 @@ class Admin::RunnersController < Admin::ApplicationController
def runner_params
params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
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
= form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
= form_errors(@runner)
= form_errors(runner)
.form-group
= label :active, "Active", class: 'control-label'
.col-sm-10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment