Changed selection classes to harmonize with other settings
This commit is contained in:
parent
b3aa0711f0
commit
803d324367
|
@ -107,6 +107,7 @@ function deferredInitialisation() {
|
||||||
.then(() => {
|
.then(() => {
|
||||||
$('select.select2').select2({
|
$('select.select2').select2({
|
||||||
width: 'resolve',
|
width: 'resolve',
|
||||||
|
minimumResultsForSearch: 10,
|
||||||
dropdownAutoWidth: true,
|
dropdownAutoWidth: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -45,20 +45,20 @@
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :layout, class: 'label-bold' do
|
= f.label :layout, class: 'label-bold' do
|
||||||
= s_('Preferences|Layout width')
|
= s_('Preferences|Layout width')
|
||||||
= f.select :layout, layout_choices, {}, class: 'form-control'
|
= f.select :layout, layout_choices, {}, class: 'select2'
|
||||||
.form-text.text-muted
|
.form-text.text-muted
|
||||||
= s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.')
|
= s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.')
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :dashboard, class: 'label-bold' do
|
= f.label :dashboard, class: 'label-bold' do
|
||||||
= s_('Preferences|Default dashboard')
|
= s_('Preferences|Default dashboard')
|
||||||
= f.select :dashboard, dashboard_choices, {}, class: 'form-control'
|
= f.select :dashboard, dashboard_choices, {}, class: 'select2'
|
||||||
|
|
||||||
= render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
|
= render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
|
||||||
|
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :project_view, class: 'label-bold' do
|
= f.label :project_view, class: 'label-bold' do
|
||||||
= s_('Preferences|Project overview content')
|
= s_('Preferences|Project overview content')
|
||||||
= f.select :project_view, project_view_choices, {}, class: 'form-control'
|
= f.select :project_view, project_view_choices, {}, class: 'select2'
|
||||||
.form-text.text-muted
|
.form-text.text-muted
|
||||||
= s_('Preferences|Choose what content you want to see on a project’s overview page.')
|
= s_('Preferences|Choose what content you want to see on a project’s overview page.')
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :first_day_of_week, class: 'label-bold' do
|
= f.label :first_day_of_week, class: 'label-bold' do
|
||||||
= _('First day of the week')
|
= _('First day of the week')
|
||||||
= f.select :first_day_of_week, first_day_of_week_choices_with_default, {}, class: 'form-control'
|
= f.select :first_day_of_week, first_day_of_week_choices_with_default, {}, class: 'select2'
|
||||||
- if Feature.enabled?(:user_time_settings)
|
- if Feature.enabled?(:user_time_settings)
|
||||||
.col-sm-12
|
.col-sm-12
|
||||||
%hr
|
%hr
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Harmonize selections in user settings
|
||||||
|
merge_request: 31110
|
||||||
|
author: Marc Schwede
|
||||||
|
type: other
|
|
@ -38,7 +38,7 @@ describe 'User visits the profile preferences page' do
|
||||||
|
|
||||||
describe 'User changes their default dashboard', :js do
|
describe 'User changes their default dashboard', :js do
|
||||||
it 'creates a flash message' do
|
it 'creates a flash message' do
|
||||||
select 'Starred Projects', from: 'user_dashboard'
|
select2('stars', from: '#user_dashboard')
|
||||||
click_button 'Save'
|
click_button 'Save'
|
||||||
|
|
||||||
wait_for_requests
|
wait_for_requests
|
||||||
|
@ -47,7 +47,7 @@ describe 'User visits the profile preferences page' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'updates their preference' do
|
it 'updates their preference' do
|
||||||
select 'Starred Projects', from: 'user_dashboard'
|
select2('stars', from: '#user_dashboard')
|
||||||
click_button 'Save'
|
click_button 'Save'
|
||||||
|
|
||||||
wait_for_requests
|
wait_for_requests
|
||||||
|
|
Loading…
Reference in New Issue