Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
63f11a68
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,体验更适合开发者的 AI 搜索 >>
提交
63f11a68
编写于
2月 18, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix event loading with associations
上级
a6070074
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
10 deletion
+25
-10
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+11
-4
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+11
-4
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+1
-1
app/models/event.rb
app/models/event.rb
+1
-0
未找到文件。
app/controllers/dashboard_controller.rb
浏览文件 @
63f11a68
...
...
@@ -22,13 +22,14 @@ class DashboardController < ApplicationController
format
.
html
format
.
json
do
@events
=
Event
.
in_projects
(
current_user
.
authorized_projects
.
pluck
(
:id
))
@events
=
@event_filter
.
apply_filter
(
@events
).
includes
(
:target
,
project: :namespace
)
@events
=
@events
.
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
load_events
pager_json
(
"events/_events"
,
@events
.
count
)
end
format
.
atom
{
render
layout:
false
}
format
.
atom
do
load_events
render
layout:
false
end
end
end
...
...
@@ -77,4 +78,10 @@ class DashboardController < ApplicationController
def
load_projects
@projects
=
current_user
.
authorized_projects
.
sorted_by_activity
.
non_archived
end
def
load_events
@events
=
Event
.
in_projects
(
current_user
.
authorized_projects
.
pluck
(
:id
))
@events
=
@event_filter
.
apply_filter
(
@events
).
with_associations
@events
=
@events
.
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
end
end
app/controllers/groups_controller.rb
浏览文件 @
63f11a68
...
...
@@ -39,13 +39,14 @@ class GroupsController < ApplicationController
format
.
html
format
.
json
do
@events
=
Event
.
in_projects
(
project_ids
)
@events
=
event_filter
.
apply_filter
(
@events
).
includes
(
:target
,
project: :namespace
)
@events
=
@events
.
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
load_events
pager_json
(
"events/_events"
,
@events
.
count
)
end
format
.
atom
{
render
layout:
false
}
format
.
atom
do
load_events
render
layout:
false
end
end
end
...
...
@@ -154,4 +155,10 @@ class GroupsController < ApplicationController
def
group_params
params
.
require
(
:group
).
permit
(
:name
,
:description
,
:path
,
:avatar
)
end
def
load_events
@events
=
Event
.
in_projects
(
project_ids
)
@events
=
event_filter
.
apply_filter
(
@events
).
with_associations
@events
=
@events
.
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
end
end
app/controllers/projects_controller.rb
浏览文件 @
63f11a68
...
...
@@ -76,7 +76,7 @@ class ProjectsController < ApplicationController
format
.
json
do
@events
=
@project
.
events
.
recent
@events
=
event_filter
.
apply_filter
(
@events
).
includes
(
:target
,
project: :namespace
)
@events
=
event_filter
.
apply_filter
(
@events
).
with_associations
@events
=
@events
.
limit
(
limit
).
offset
(
params
[
:offset
]
||
0
)
pager_json
(
'events/_events'
,
@events
.
count
)
end
...
...
app/controllers/users_controller.rb
浏览文件 @
63f11a68
...
...
@@ -20,7 +20,7 @@ class UsersController < ApplicationController
# Get user activity feed for projects common for both users
@events
=
@user
.
recent_events
.
where
(
project_id:
authorized_projects_ids
).
includes
(
:target
,
project: :namespace
)
.
limit
(
30
)
with_associations
.
limit
(
30
)
@title
=
@user
.
name
@title_url
=
user_path
(
@user
)
...
...
app/models/event.rb
浏览文件 @
63f11a68
...
...
@@ -47,6 +47,7 @@ class Event < ActiveRecord::Base
scope
:recent
,
->
{
order
(
"created_at DESC"
)
}
scope
:code_push
,
->
{
where
(
action:
PUSHED
)
}
scope
:in_projects
,
->
(
project_ids
)
{
where
(
project_id:
project_ids
).
recent
}
scope
:with_associations
,
->
{
includes
(
project: :namespace
)
}
class
<<
self
def
reset_event_cache_for
(
target
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录