mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-10 13:16:09 +10:00
Douwe MaanandMarin Jankovski
1b23122f99
Include missing events and fix save functionality in admin service template settings form ### What does this MR do? This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings. ### Are there points in the code the reviewer needs to double check? No. ### Why was this MR needed? Because the service template form was broken and untested. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1275 Before:  After:  See merge request !427
55 lines
1.5 KiB
Ruby
55 lines
1.5 KiB
Ruby
class Admin::ServicesController < Admin::ApplicationController
|
|
before_filter :service, only: [:edit, :update]
|
|
|
|
def index
|
|
@services = services_templates
|
|
end
|
|
|
|
def edit
|
|
unless service.present?
|
|
redirect_to admin_application_settings_services_path,
|
|
alert: "Service is unknown or it doesn't exist"
|
|
end
|
|
end
|
|
|
|
def update
|
|
if service.update_attributes(application_services_params[:service])
|
|
redirect_to admin_application_settings_services_path,
|
|
notice: 'Application settings saved successfully'
|
|
else
|
|
render :edit
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def services_templates
|
|
templates = []
|
|
|
|
Service.available_services_names.each do |service_name|
|
|
service_template = service_name.concat("_service").camelize.constantize
|
|
templates << service_template.where(template: true).first_or_create
|
|
end
|
|
|
|
templates
|
|
end
|
|
|
|
def service
|
|
@service ||= Service.where(id: params[:id], template: true).first
|
|
end
|
|
|
|
def application_services_params
|
|
params.permit(:id,
|
|
service: [
|
|
:title, :token, :type, :active, :api_key, :subdomain,
|
|
:room, :recipients, :project_url, :webhook,
|
|
:user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
|
|
:build_key, :server, :teamcity_url, :build_type,
|
|
:description, :issues_url, :new_issue_url, :restrict_to_branch,
|
|
:send_from_committer_email, :disable_diffs,
|
|
:push_events, :tag_push_events, :note_events, :issues_events,
|
|
:merge_requests_events
|
|
])
|
|
end
|
|
end
|