Merge branch '24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disable' into 'master'
Import sources buttons to checkboxes ## What does this MR do? Swaps the `/application_settings` `Import Sources` buttons to checkboxes. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-11-19_14.42.39](/uploads/5bf53ecb54765bd80ab275714208ee9a/2016-11-19_14.42.39.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24161 See merge request !7598
This commit is contained in:
commit
f7fb61b4f9
3 changed files with 10 additions and 8 deletions
|
@ -67,14 +67,14 @@ module ApplicationSettingsHelper
|
||||||
def import_sources_checkboxes(help_block_id)
|
def import_sources_checkboxes(help_block_id)
|
||||||
Gitlab::ImportSources.options.map do |name, source|
|
Gitlab::ImportSources.options.map do |name, source|
|
||||||
checked = current_application_settings.import_sources.include?(source)
|
checked = current_application_settings.import_sources.include?(source)
|
||||||
css_class = 'btn'
|
css_class = checked ? 'active' : ''
|
||||||
css_class += ' active' if checked
|
|
||||||
checkbox_name = 'application_setting[import_sources][]'
|
checkbox_name = 'application_setting[import_sources][]'
|
||||||
|
|
||||||
label_tag(checkbox_name, class: css_class) do
|
label_tag(name, class: css_class) do
|
||||||
check_box_tag(checkbox_name, source, checked,
|
check_box_tag(checkbox_name, source, checked,
|
||||||
autocomplete: 'off',
|
autocomplete: 'off',
|
||||||
'aria-describedby' => help_block_id) + name
|
'aria-describedby' => help_block_id,
|
||||||
|
id: name.tr(' ', '_')) + name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,10 +31,8 @@
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :import_sources, class: 'control-label col-sm-2'
|
= f.label :import_sources, class: 'control-label col-sm-2'
|
||||||
.col-sm-10
|
.col-sm-10
|
||||||
- data_attrs = { toggle: 'buttons' }
|
- import_sources_checkboxes('import-sources-help').each do |source|
|
||||||
.btn-group{ data: data_attrs }
|
.checkbox= source
|
||||||
- import_sources_checkboxes('import-sources-help').each do |source|
|
|
||||||
= source
|
|
||||||
%span.help-block#import-sources-help
|
%span.help-block#import-sources-help
|
||||||
Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
|
Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
|
||||||
= link_to "(?)", help_page_path("integration/github")
|
= link_to "(?)", help_page_path("integration/github")
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Changed import sources buttons to checkboxes
|
||||||
|
merge_request: 7598
|
||||||
|
author: Luke "Jared" Bennett
|
Loading…
Reference in a new issue