Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2bc4fd2d
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2bc4fd2d
编写于
6月 10, 2015
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add `dashboard` attribute to User model
上级
35339bb1
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
3 deletion
+22
-3
app/controllers/profiles/preferences_controller.rb
app/controllers/profiles/preferences_controller.rb
+1
-0
app/models/user.rb
app/models/user.rb
+6
-1
db/migrate/20150610065936_add_dashboard_to_users.rb
db/migrate/20150610065936_add_dashboard_to_users.rb
+9
-0
db/schema.rb
db/schema.rb
+2
-1
spec/controllers/profiles/preferences_controller_spec.rb
spec/controllers/profiles/preferences_controller_spec.rb
+2
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+2
-1
未找到文件。
app/controllers/profiles/preferences_controller.rb
浏览文件 @
2bc4fd2d
...
...
@@ -26,6 +26,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
def
preferences_params
params
.
require
(
:user
).
permit
(
:color_scheme_id
,
:dashboard
,
:theme_id
)
end
...
...
app/models/user.rb
浏览文件 @
2bc4fd2d
...
...
@@ -50,12 +50,13 @@
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_salt :string(255)
# otp_required_for_login :boolean
# otp_backup_codes :text
#
public_email :string(255) default(""), not null
#
dashboard :integer default(0)
#
require
'carrierwave/orm/activerecord'
...
...
@@ -701,4 +702,8 @@ class User < ActiveRecord::Base
def
can_be_removed?
!
solo_owned_groups
.
present?
end
# User's Dashboard preference
# Note: When adding an option, it MUST go on the end of the array.
enum
dashboard:
[
:projects
,
:stars
]
end
db/migrate/20150610065936_add_dashboard_to_users.rb
0 → 100644
浏览文件 @
2bc4fd2d
class
AddDashboardToUsers
<
ActiveRecord
::
Migration
def
up
add_column
:users
,
:dashboard
,
:integer
,
default:
0
end
def
down
remove_column
:users
,
:dashboard
end
end
db/schema.rb
浏览文件 @
2bc4fd2d
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201506
09141121
)
do
ActiveRecord
::
Schema
.
define
(
version:
201506
10065936
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -502,6 +502,7 @@ ActiveRecord::Schema.define(version: 20150609141121) do
t
.
boolean
"otp_required_for_login"
t
.
text
"otp_backup_codes"
t
.
string
"public_email"
,
default:
""
,
null:
false
t
.
integer
"dashboard"
,
default:
0
end
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
...
...
spec/controllers/profiles/preferences_controller_spec.rb
浏览文件 @
2bc4fd2d
...
...
@@ -25,6 +25,7 @@ describe Profiles::PreferencesController do
def
go
(
params:
{},
format: :js
)
params
.
reverse_merge!
(
color_scheme_id:
'1'
,
dashboard:
'stars'
,
theme_id:
'1'
)
...
...
@@ -40,6 +41,7 @@ describe Profiles::PreferencesController do
it
"changes the user's preferences"
do
prefs
=
{
color_scheme_id:
'1'
,
dashboard:
'stars'
,
theme_id:
'2'
}.
with_indifferent_access
...
...
spec/models/user_spec.rb
浏览文件 @
2bc4fd2d
...
...
@@ -50,12 +50,13 @@
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_salt :string(255)
# otp_required_for_login :boolean
# otp_backup_codes :text
#
public_email :string(255) default(""), not null
#
dashboard :integer default(0)
#
require
'spec_helper'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录