diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-06 14:50:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-06 14:50:22 +0000 |
| commit | dfd3178c13f88cee5e5ba03f91c85b78ca05e22b (patch) | |
| tree | afe70d08e856662d16e3385d81da4e3bba1a4815 | |
| parent | 72ed502aaed8e0ce6782c04fb7db300179c4905d (diff) | |
| parent | a45a2d47ccd1eeaf69a443755133268579185a64 (diff) | |
| download | gitlab-ce-dfd3178c13f88cee5e5ba03f91c85b78ca05e22b.tar.gz | |
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
| -rw-r--r-- | app/models/service.rb | 8 | ||||
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 21 | ||||
| -rw-r--r-- | app/views/shared/_service_settings.html.haml | 9 |
3 files changed, 24 insertions, 14 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index 60fa81b18c4..6b64079215f 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -51,6 +51,14 @@ class Service < ActiveRecord::Base active end + def show_active_box? + true + end + + def editable? + true + end + def template? template end diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 7eab428bb2e..b842fd57cf3 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -11,16 +11,17 @@ .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| = 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', project_settings_integrations_path(@project), class: 'btn btn-cancel' diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index b200e5fc528..7ca14ac93cc 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -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 |