Commit dfd3178c authored by Sean McGivern's avatar Sean McGivern

Merge branch 'backport_slack_application_changes' into 'master'

Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259

See merge request !12653
parents 72ed502a a45a2d47
...@@ -51,6 +51,14 @@ class Service < ActiveRecord::Base ...@@ -51,6 +51,14 @@ class Service < ActiveRecord::Base
active active
end end
def show_active_box?
true
end
def editable?
true
end
def template? def template?
template template
end end
......
...@@ -11,16 +11,17 @@ ...@@ -11,16 +11,17 @@
.col-lg-9 .col-lg-9
= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors form-horizontal js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form| = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors form-horizontal js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form|
= render 'shared/service_settings', form: form, subject: @service = render 'shared/service_settings', form: form, subject: @service
.footer-block.row-content-block - if @service.editable?
%button.btn.btn-save{ type: 'submit' } .footer-block.row-content-block
= icon('spinner spin', class: 'hidden js-btn-spinner') %button.btn.btn-save{ type: 'submit' }
%span.js-btn-label = icon('spinner spin', class: 'hidden js-btn-spinner')
Save changes %span.js-btn-label
&nbsp; Save changes
- if @service.valid? && @service.activated? &nbsp;
- unless @service.can_test? - if @service.valid? && @service.activated?
- disabled_class = 'disabled' - unless @service.can_test?
- disabled_title = @service.disabled_title - disabled_class = 'disabled'
- disabled_title = @service.disabled_title
= link_to 'Cancel', project_settings_integrations_path(@project), class: 'btn btn-cancel' = link_to 'Cancel', project_settings_integrations_path(@project), class: 'btn btn-cancel'
......
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
= markdown @service.help = markdown @service.help
.service-settings .service-settings
.form-group - if @service.show_active_box?
= form.label :active, "Active", class: "control-label" .form-group
.col-sm-10 = form.label :active, "Active", class: "control-label"
= form.check_box :active .col-sm-10
= form.check_box :active
- if @service.supported_events.present? - if @service.supported_events.present?
.form-group .form-group
......
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