Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
1eb9a02f
Commit
1eb9a02f
authored
9 years ago
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a form field to customize the dashboard preference
parent
6de39583
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
2 deletions
+53
-2
app/helpers/preferences_helper.rb
app/helpers/preferences_helper.rb
+19
-0
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+17
-2
spec/helpers/preferences_helper_spec.rb
spec/helpers/preferences_helper_spec.rb
+17
-0
No files found.
app/helpers/preferences_helper.rb
View file @
1eb9a02f
...
...
@@ -20,6 +20,25 @@ module PreferencesHelper
COLOR_SCHEMES
.
freeze
end
# Populates the dashboard preference select field with more user-friendly
# values.
def
dashboard_choices
orig
=
User
.
dashboards
.
keys
choices
=
[
[
'Projects (default)'
,
orig
[
0
]],
[
'Starred Projects'
,
orig
[
1
]]
]
if
orig
.
size
!=
choices
.
size
# Assure that anyone adding new options updates this method too
raise
RuntimeError
,
"`User` defines
#{
orig
.
size
}
dashboard choices,"
+
" but
#{
__method__
}
defined
#{
choices
.
size
}
"
else
choices
end
end
def
user_application_theme
theme
=
Gitlab
::
Themes
.
by_id
(
current_user
.
try
(
:theme_id
))
theme
.
css_class
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/preferences/show.html.haml
View file @
1eb9a02f
-
page_title
"Design"
-
page_title
'Preferences'
%h3
.page-title
=
page_title
%p
.light
Appearance settings will be saved to your profile and made available across all devices.
These settings allow you to customize the appearance and behavior of the site.
They are saved with your account and will persist to any device you use to
access the site.
%hr
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'js-preferences-form'
}
do
|
f
|
...
...
@@ -25,3 +27,16 @@
.preview
=
image_tag
"
#{
color_scheme
}
-scheme-preview.png"
=
f
.
radio_button
:color_scheme_id
,
color_scheme_id
=
color_scheme
.
tr
(
'-_'
,
' '
).
titleize
.panel.panel-default
.panel-heading
Behavior
.panel-body
.form-group
=
f
.
label
:dashboard
,
class:
'control-label'
.col-sm-10
=
f
.
select
:dashboard
,
dashboard_choices
,
{},
class:
'form-control'
%p
.help-block.hint
This setting allows you to customize the default Dashboard page.
.panel-footer
=
f
.
submit
'Save'
,
class:
'btn btn-save'
This diff is collapsed.
Click to expand it.
spec/helpers/preferences_helper_spec.rb
View file @
1eb9a02f
...
...
@@ -30,6 +30,23 @@ describe PreferencesHelper do
end
end
describe
'dashboard_choices'
do
it
'raises an exception when defined choices may be missing'
do
dashboards
=
User
.
dashboards
expect
(
User
).
to
receive
(
:dashboards
).
and_return
(
dashboards
.
merge
(
foo:
'foo'
))
expect
{
dashboard_choices
}.
to
raise_error
end
it
'provides better option descriptions'
do
choices
=
dashboard_choices
expect
(
choices
[
0
]).
to
eq
[
'Projects (default)'
,
'projects'
]
expect
(
choices
[
1
]).
to
eq
[
'Starred Projects'
,
'stars'
]
end
end
describe
'user_color_scheme_class'
do
context
'with current_user is nil'
do
it
'should return a string'
do
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment