Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
667edcdd
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,发现更多精彩内容 >>
提交
667edcdd
编写于
4月 08, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Dashboard issues/mr pages improved
上级
88974b50
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
43 addition
and
7 deletion
+43
-7
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+3
-0
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+2
-3
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+19
-2
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+19
-2
未找到文件。
app/assets/stylesheets/common.scss
浏览文件 @
667edcdd
...
...
@@ -406,6 +406,9 @@ img.lil_av {
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.05
);
cursor
:pointer
;
&
.smoke
{
background-color
:
#f5f5f5
;
}
&
:hover
{
background
:
$hover
;
}
...
...
app/controllers/dashboard_controller.rb
浏览文件 @
667edcdd
...
...
@@ -19,15 +19,14 @@ class DashboardController < ApplicationController
# Get authored or assigned open merge requests
def
merge_requests
@projects
=
current_user
.
projects
.
all
@merge_requests
=
current_user
.
cared_merge_requests
.
order
(
"created_at DESC"
).
limit
(
4
0
)
@merge_requests
=
current_user
.
cared_merge_requests
.
order
(
"created_at DESC"
).
page
(
params
[
:page
]).
per
(
2
0
)
end
# Get only assigned issues
def
issues
@projects
=
current_user
.
projects
.
all
@user
=
current_user
@issues
=
current_user
.
assigned_issues
.
opened
.
order
(
"created_at DESC"
).
limit
(
40
)
@issues
=
current_user
.
assigned_issues
.
opened
.
order
(
"created_at DESC"
).
page
(
params
[
:page
]).
per
(
20
)
@issues
=
@issues
.
includes
(
:author
,
:project
)
respond_to
do
|
format
|
...
...
app/views/dashboard/issues.html.haml
浏览文件 @
667edcdd
...
...
@@ -3,5 +3,22 @@
%small
(assigned to you)
%br
-
if
@issues
.
any?
.ui-box
=
render
"dashboard/issues_feed"
%div
#issues-table-holder
.ui-box
%title
%ul
#issues-table
.unstyled
-
if
@issues
.
any?
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%li
.wll.smoke
-
project
=
group
[
0
]
=
project
.
name
-
group
[
1
].
each
do
|
issue
|
=
render
(
:partial
=>
'issues/show'
,
:locals
=>
{
:issue
=>
issue
})
%li
.bottom
.row
.span10
=
paginate
@issues
,
:theme
=>
"gitlab"
.span4.right
%span
.cgray.right
#{
@issues
.
total_count
}
issues
-
else
%li
%p
.padded
Nothing to show here
app/views/dashboard/merge_requests.html.haml
浏览文件 @
667edcdd
...
...
@@ -3,5 +3,22 @@
%small
(authored or assigned to you)
%br
-
if
@merge_requests
.
any?
.ui-box
=
render
"dashboard/merge_requests_feed"
%div
#merge_requests-table-holder
.ui-box
%title
%ul
#merge_requests-table
.unstyled
-
if
@merge_requests
.
any?
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
%li
.wll.smoke
-
project
=
group
[
0
]
=
project
.
name
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
:partial
=>
'merge_requests/merge_request'
,
:locals
=>
{
:merge_request
=>
merge_request
})
%li
.bottom
.row
.span10
=
paginate
@merge_requests
,
:theme
=>
"gitlab"
.span4.right
%span
.cgray.right
#{
@merge_requests
.
total_count
}
merge requests
-
else
%li
%p
.padded
Nothing to show here
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录