Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
59a330f4
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,发现更多精彩内容 >>
提交
59a330f4
编写于
4月 18, 2017
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove assigned_(issues|merge_requests) methods from the issuable
上级
d910a777
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
10 deletion
+4
-10
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-1
app/models/user.rb
app/models/user.rb
+2
-5
spec/models/user_spec.rb
spec/models/user_spec.rb
+0
-2
spec/services/members/authorized_destroy_service_spec.rb
spec/services/members/authorized_destroy_service_spec.rb
+1
-2
未找到文件。
app/helpers/issuables_helper.rb
浏览文件 @
59a330f4
...
...
@@ -194,7 +194,7 @@ module IssuablesHelper
def
assigned_issuables_count
(
assignee
,
issuable_type
,
state
)
params
=
{
assignee_id:
assignee
.
id
,
state:
state
}
Object
::
const_get
(
"
#{
issuable_type
.
to_s
.
camelize
}
Finder"
).
new
(
current_user
,
params
).
execute
.
count
Object
.
const_get
(
"
#{
issuable_type
.
to_s
.
camelize
}
Finder"
).
new
(
current_user
,
params
).
execute
.
count
end
def
sidebar_gutter_collapsed?
...
...
app/models/user.rb
浏览文件 @
59a330f4
...
...
@@ -99,9 +99,6 @@ class User < ActiveRecord::Base
has_many
:award_emoji
,
dependent: :destroy
has_many
:triggers
,
dependent: :destroy
,
class_name:
'Ci::Trigger'
,
foreign_key: :owner_id
has_many
:assigned_issues
,
dependent: :nullify
,
foreign_key: :assignee_id
,
class_name:
"Issue"
has_many
:assigned_merge_requests
,
dependent: :nullify
,
foreign_key: :assignee_id
,
class_name:
"MergeRequest"
# Issues that a user owns are expected to be moved to the "ghost" user before
# the user is destroyed. If the user owns any issues during deletion, this
# should be treated as an exceptional condition.
...
...
@@ -893,13 +890,13 @@ class User < ActiveRecord::Base
def
assigned_open_merge_request_count
(
force:
false
)
Rails
.
cache
.
fetch
([
'users'
,
id
,
'assigned_open_merge_request_count'
],
force:
force
)
do
assigned_merge_requests
.
opened
.
count
MergeRequestsFinder
.
new
(
self
,
assignee_id:
self
.
id
,
state:
'opened'
).
execute
.
count
end
end
def
assigned_open_issues_count
(
force:
false
)
Rails
.
cache
.
fetch
([
'users'
,
id
,
'assigned_open_issues_count'
],
force:
force
)
do
assigned_issues
.
opened
.
count
IssuesFinder
.
new
(
self
,
assignee_id:
self
.
id
,
state:
'opened'
).
execute
.
count
end
end
...
...
spec/models/user_spec.rb
浏览文件 @
59a330f4
...
...
@@ -24,9 +24,7 @@ describe User, models: true do
it
{
is_expected
.
to
have_many
(
:recent_events
).
class_name
(
'Event'
)
}
it
{
is_expected
.
to
have_many
(
:issues
).
dependent
(
:restrict_with_exception
)
}
it
{
is_expected
.
to
have_many
(
:notes
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:assigned_issues
).
dependent
(
:nullify
)
}
it
{
is_expected
.
to
have_many
(
:merge_requests
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:assigned_merge_requests
).
dependent
(
:nullify
)
}
it
{
is_expected
.
to
have_many
(
:identities
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:spam_logs
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:todos
).
dependent
(
:destroy
)
}
...
...
spec/services/members/authorized_destroy_service_spec.rb
浏览文件 @
59a330f4
require
'spec_helper'
describe
Members
::
AuthorizedDestroyService
,
services:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:member_user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:group
)
{
create
(
:group
,
:public
)
}
let
(
:group_project
)
{
create
(
:empty_project
,
:public
,
group:
group
)
}
def
number_of_assigned_issuables
(
user
)
user
.
assigned_issues
.
count
+
user
.
assigned_merge_requests
.
count
Issue
.
assigned_to
(
user
).
count
+
MergeRequest
.
assigned_to
(
user
)
.
count
end
context
'Group member'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录