Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
de6f2884
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,发现更多精彩内容 >>
未验证
提交
de6f2884
编写于
2月 03, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Sort projects by last activity for project switcher in header
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
c8224f0b
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
8 addition
and
3 deletion
+8
-3
app/assets/javascripts/api.js.coffee
app/assets/javascripts/api.js.coffee
+2
-1
app/assets/javascripts/project_select.js.coffee
app/assets/javascripts/project_select.js.coffee
+2
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+4
-1
未找到文件。
app/assets/javascripts/api.js.coffee
浏览文件 @
de6f2884
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
callback
(
namespaces
)
callback
(
namespaces
)
# Return projects list. Filtered by query
# Return projects list. Filtered by query
projects
:
(
query
,
callback
)
->
projects
:
(
query
,
order
,
callback
)
->
url
=
Api
.
buildUrl
(
Api
.
projects_path
)
url
=
Api
.
buildUrl
(
Api
.
projects_path
)
$
.
ajax
(
$
.
ajax
(
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
data
:
data
:
private_token
:
gon
.
api_token
private_token
:
gon
.
api_token
search
:
query
search
:
query
order_by
:
order
per_page
:
20
per_page
:
20
dataType
:
"json"
dataType
:
"json"
).
done
(
projects
)
->
).
done
(
projects
)
->
...
...
app/assets/javascripts/project_select.js.coffee
浏览文件 @
de6f2884
...
@@ -3,6 +3,7 @@ class @ProjectSelect
...
@@ -3,6 +3,7 @@ class @ProjectSelect
$
(
'.ajax-project-select'
).
each
(
i
,
select
)
->
$
(
'.ajax-project-select'
).
each
(
i
,
select
)
->
@
groupId
=
$
(
select
).
data
(
'group-id'
)
@
groupId
=
$
(
select
).
data
(
'group-id'
)
@
includeGroups
=
$
(
select
).
data
(
'include-groups'
)
@
includeGroups
=
$
(
select
).
data
(
'include-groups'
)
@
orderBy
=
$
(
select
).
data
(
'order-by'
)
||
'id'
placeholder
=
"Search for project"
placeholder
=
"Search for project"
placeholder
+=
" or group"
if
@
includeGroups
placeholder
+=
" or group"
if
@
includeGroups
...
@@ -28,7 +29,7 @@ class @ProjectSelect
...
@@ -28,7 +29,7 @@ class @ProjectSelect
if
@
groupId
if
@
groupId
Api
.
groupProjects
@
groupId
,
query
.
term
,
projectsCallback
Api
.
groupProjects
@
groupId
,
query
.
term
,
projectsCallback
else
else
Api
.
projects
query
.
term
,
projectsCallback
Api
.
projects
query
.
term
,
@
orderBy
,
projectsCallback
id
:
(
project
)
->
id
:
(
project
)
->
project
.
web_url
project
.
web_url
...
...
app/helpers/projects_helper.rb
浏览文件 @
de6f2884
...
@@ -57,7 +57,10 @@ module ProjectsHelper
...
@@ -57,7 +57,10 @@ module ProjectsHelper
link_output
=
simple_sanitize
(
project
.
name
)
link_output
=
simple_sanitize
(
project
.
name
)
link_output
+=
content_tag
:span
,
nil
,
{
class:
"fa fa-chevron-down dropdown-toggle-caret"
}
if
current_user
link_output
+=
content_tag
:span
,
nil
,
{
class:
"fa fa-chevron-down dropdown-toggle-caret"
}
if
current_user
link_output
+=
project_select_tag
:project_path
,
class:
"project-item-select js-projects-dropdown"
,
data:
{
include_groups:
false
}
if
current_user
if
current_user
link_output
+=
project_select_tag
:project_path
,
class:
"project-item-select js-projects-dropdown"
,
data:
{
include_groups:
false
,
order_by:
'last_activity_at'
}
end
link_output
link_output
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录