Skip to content
Snippets Groups Projects
Commit 803d3243 authored by Marc Schwede's avatar Marc Schwede Committed by Clement Ho
Browse files

Changed selection classes to harmonize with other settings

parent b3aa0711
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -107,6 +107,7 @@ function deferredInitialisation() {
.then(() => {
$('select.select2').select2({
width: 'resolve',
minimumResultsForSearch: 10,
dropdownAutoWidth: true,
});
 
Loading
Loading
Loading
Loading
@@ -45,20 +45,20 @@
.form-group
= f.label :layout, class: 'label-bold' do
= s_('Preferences|Layout width')
= f.select :layout, layout_choices, {}, class: 'form-control'
= f.select :layout, layout_choices, {}, class: 'select2'
.form-text.text-muted
= s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.')
.form-group
= f.label :dashboard, class: 'label-bold' do
= 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
 
.form-group
= f.label :project_view, class: 'label-bold' do
= 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
= s_('Preferences|Choose what content you want to see on a project’s overview page.')
 
Loading
Loading
@@ -82,7 +82,7 @@
.form-group
= f.label :first_day_of_week, class: 'label-bold' do
= _('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)
.col-sm-12
%hr
Loading
Loading
---
title: Harmonize selections in user settings
merge_request: 31110
author: Marc Schwede
type: other
Loading
Loading
@@ -38,7 +38,7 @@ describe 'User visits the profile preferences page' do
 
describe 'User changes their default dashboard', :js do
it 'creates a flash message' do
select 'Starred Projects', from: 'user_dashboard'
select2('stars', from: '#user_dashboard')
click_button 'Save'
 
wait_for_requests
Loading
Loading
@@ -47,7 +47,7 @@ describe 'User visits the profile preferences page' do
end
 
it 'updates their preference' do
select 'Starred Projects', from: 'user_dashboard'
select2('stars', from: '#user_dashboard')
click_button 'Save'
 
wait_for_requests
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment