Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259
This commit is contained in:
parent
491110d633
commit
a45a2d47cc
|
@ -51,6 +51,14 @@ class Service < ActiveRecord::Base
|
|||
active
|
||||
end
|
||||
|
||||
def show_active_box?
|
||||
true
|
||||
end
|
||||
|
||||
def editable?
|
||||
true
|
||||
end
|
||||
|
||||
def template?
|
||||
template
|
||||
end
|
||||
|
|
|
@ -11,16 +11,17 @@
|
|||
.col-lg-9
|
||||
= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @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_namespace_project_service_path } }) do |form|
|
||||
= render 'shared/service_settings', form: form, subject: @service
|
||||
.footer-block.row-content-block
|
||||
%button.btn.btn-save{ type: 'submit' }
|
||||
= icon('spinner spin', class: 'hidden js-btn-spinner')
|
||||
%span.js-btn-label
|
||||
Save changes
|
||||
|
||||
- if @service.valid? && @service.activated?
|
||||
- unless @service.can_test?
|
||||
- disabled_class = 'disabled'
|
||||
- disabled_title = @service.disabled_title
|
||||
- if @service.editable?
|
||||
.footer-block.row-content-block
|
||||
%button.btn.btn-save{ type: 'submit' }
|
||||
= icon('spinner spin', class: 'hidden js-btn-spinner')
|
||||
%span.js-btn-label
|
||||
Save changes
|
||||
|
||||
- if @service.valid? && @service.activated?
|
||||
- unless @service.can_test?
|
||||
- disabled_class = 'disabled'
|
||||
- disabled_title = @service.disabled_title
|
||||
|
||||
= link_to 'Cancel', namespace_project_settings_integrations_path(@project.namespace, @project), class: 'btn btn-cancel'
|
||||
|
||||
|
|
|
@ -7,10 +7,11 @@
|
|||
= markdown @service.help
|
||||
|
||||
.service-settings
|
||||
.form-group
|
||||
= form.label :active, "Active", class: "control-label"
|
||||
.col-sm-10
|
||||
= form.check_box :active
|
||||
- if @service.show_active_box?
|
||||
.form-group
|
||||
= form.label :active, "Active", class: "control-label"
|
||||
.col-sm-10
|
||||
= form.check_box :active
|
||||
|
||||
- if @service.supported_events.present?
|
||||
.form-group
|
||||
|
|
Loading…
Reference in New Issue