Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
06ba8281
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 搜索 >>
提交
06ba8281
编写于
10月 14, 2011
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactoring + remove unnecessary feature
上级
f51a4016
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
36 addition
and
50 deletion
+36
-50
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+18
-10
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+4
-10
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+9
-12
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+0
-8
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+1
-3
app/views/projects/_tree.html.haml
app/views/projects/_tree.html.haml
+3
-6
app/views/projects/_tree_item.html.haml
app/views/projects/_tree_item.html.haml
+1
-1
未找到文件。
app/controllers/application_controller.rb
浏览文件 @
06ba8281
...
...
@@ -42,15 +42,23 @@ class ApplicationController < ActionController::Base
end
end
def
refs_from_cookie
if
@project
&&
session
[
:ui
]
&&
session
[
:ui
][
@project
.
id
]
project_session
=
session
[
:ui
][
@project
.
id
]
project_session
[
:branch
]
=
nil
if
params
[
:tag
]
params
[
:branch
]
||=
project_session
[
:branch
]
params
[
:tag
]
||=
project_session
[
:tag
]
end
rescue
session
[
:ui
]
=
nil
def
load_refs
@branch
=
unless
params
[
:branch
].
blank?
params
[
:branch
]
else
nil
end
@tag
=
unless
params
[
:tag
].
blank?
params
[
:tag
]
else
nil
end
@ref
=
@branch
||
@tag
||
"master"
end
def
render_404
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"404"
),
:layout
=>
false
,
:status
=>
"404"
end
end
app/controllers/commits_controller.rb
浏览文件 @
06ba8281
...
...
@@ -8,20 +8,14 @@ class CommitsController < ApplicationController
before_filter
:authorize_read_project!
def
index
refs_from_cookie
load_refs
# load @branch, @tag & @ref
@repo
=
project
.
repo
@branch
=
if
!
params
[
:branch
].
blank?
params
[
:branch
]
elsif
!
params
[
:tag
].
blank?
params
[
:tag
]
else
"master"
end
if
params
[
:path
]
@commits
=
@repo
.
log
(
@
branch
,
params
[
:path
],
:max_count
=>
params
[
:limit
]
||
100
,
:skip
=>
params
[
:offset
]
||
0
)
@commits
=
@repo
.
log
(
@
ref
,
params
[
:path
],
:max_count
=>
params
[
:limit
]
||
100
,
:skip
=>
params
[
:offset
]
||
0
)
else
@commits
=
@repo
.
commits
(
@
branch
,
params
[
:limit
]
||
100
,
params
[
:offset
]
||
0
)
@commits
=
@repo
.
commits
(
@
ref
,
params
[
:limit
]
||
100
,
params
[
:offset
]
||
0
)
end
respond_to
do
|
format
|
...
...
app/controllers/projects_controller.rb
浏览文件 @
06ba8281
...
...
@@ -16,7 +16,6 @@ class ProjectsController < ApplicationController
end
def
show
refs_from_cookie
@repo
=
project
.
repo
@commit
=
@repo
.
commits
.
first
@tree
=
@commit
.
tree
...
...
@@ -33,34 +32,30 @@ class ProjectsController < ApplicationController
end
def
tree
refs_from_cookie
load_refs
# load @branch, @tag & @ref
@repo
=
project
.
repo
@branch
=
if
!
params
[
:branch
].
blank?
params
[
:branch
]
elsif
!
params
[
:tag
].
blank?
params
[
:tag
]
else
"master"
end
if
params
[
:commit_id
]
@commit
=
@repo
.
commits
(
params
[
:commit_id
]).
first
else
@commit
=
@repo
.
commits
(
@
branch
||
"master"
).
first
@commit
=
@repo
.
commits
(
@
ref
||
"master"
).
first
end
@tree
=
@commit
.
tree
@tree
=
@tree
/
params
[
:path
]
if
params
[
:path
]
respond_to
do
|
format
|
format
.
html
# show.html.erb
format
.
js
do
#
temp solution
#
diasbale cache to allow back button works
response
.
headers
[
"Cache-Control"
]
=
"no-cache, no-store, max-age=0, must-revalidate"
response
.
headers
[
"Pragma"
]
=
"no-cache"
response
.
headers
[
"Expires"
]
=
"Fri, 01 Jan 1990 00:00:00 GMT"
end
format
.
json
{
render
json:
project
}
end
rescue
return
render_404
end
def
blob
...
...
@@ -73,6 +68,8 @@ class ProjectsController < ApplicationController
else
head
(
404
)
end
rescue
return
render_404
end
def
new
...
...
app/helpers/projects_helper.rb
浏览文件 @
06ba8281
...
...
@@ -3,12 +3,4 @@ module ProjectsHelper
cookies
[
"project_view"
]
||=
"tile"
cookies
[
"project_view"
]
==
type
?
nil
:
"display:none"
end
def
remember_refs
session
[
:ui
]
||=
{}
session
[
:ui
][
@project
.
id
]
=
{
:branch
=>
params
[
:branch
],
:tag
=>
params
[
:tag
]
}
end
end
app/views/commits/index.html.haml
浏览文件 @
06ba8281
...
...
@@ -6,12 +6,10 @@
.left.prepend-1
=
form_tag
project_commits_path
(
@project
),
:method
=>
:get
do
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@
branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@
tag
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
text_field_tag
"ssh"
,
@project
.
url_to_repo
,
:class
=>
[
"ssh_project_url"
,
"one_click_select"
]
.clear
-
if
params
[
:path
]
%h3
{
:style
=>
"color:#555"
}
/
#{
params
[
:path
]
}
%div
{
:id
=>
dom_id
(
@project
)}
=
render
"commits"
-
remember_refs
app/views/projects/_tree.html.haml
浏览文件 @
06ba8281
...
...
@@ -5,7 +5,7 @@
.left.prepend-1
=
form_tag
tree_project_path
(
@project
),
:method
=>
:get
do
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@
branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@
tag
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
text_field_tag
"ssh"
,
@project
.
url_to_repo
,
:class
=>
[
"ssh_project_url"
,
"one_click_select"
]
.clear
...
...
@@ -18,7 +18,7 @@
-
if
part_path
.
empty?
-
part_path
=
part
\/
=
link_to
truncate
(
part
,
:length
=>
40
),
tree_file_project_path
(
@project
,
:path
=>
part_path
,
:commit_id
=>
@commit
.
try
(
:id
)),
:remote
=>
:true
=
link_to
truncate
(
part
,
:length
=>
40
),
tree_file_project_path
(
@project
,
:path
=>
part_path
,
:commit_id
=>
@commit
.
try
(
:id
)
,
:branch
=>
@branch
,
:tag
=>
@tag
),
:remote
=>
:true
#tree-content-holder
-
if
tree
.
is_a?
(
Grit
::
Blob
)
=
render
:partial
=>
"projects/tree_file"
,
:locals
=>
{
:name
=>
tree
.
name
,
:content
=>
tree
.
data
,
:file
=>
tree
}
...
...
@@ -36,7 +36,7 @@
%tr
{
:class
=>
"tree-item"
,
:url
=>
tree_file_project_path
(
@project
,
@commit
.
id
,
file
)
}
%td
.tree-item-file-name
=
image_tag
"dir.png"
=
link_to
".."
,
tree_file_project_path
(
@project
,
@commit
.
id
,
file
),
:remote
=>
:true
=
link_to
".."
,
tree_file_project_path
(
@project
,
@commit
.
id
,
file
,
:branch
=>
@branch
,
:tag
=>
@tag
),
:remote
=>
:true
%td
%td
...
...
@@ -45,9 +45,6 @@
-
contents
.
select
{
|
i
|
i
.
is_a?
(
Grit
::
Blob
)}.
each
do
|
content
|
=
render
:partial
=>
"projects/tree_item"
,
:locals
=>
{
:content
=>
content
}
-
remember_refs
:javascript
$
(
function
(){
$
(
'
select#branch
'
).
selectmenu
({
style
:
'
popup
'
,
width
:
200
});
...
...
app/views/projects/_tree_item.html.haml
浏览文件 @
06ba8281
...
...
@@ -7,7 +7,7 @@
=
image_tag
"txt.png"
-
else
=
image_tag
"dir.png"
=
link_to
truncate
(
content
.
name
,
:length
=>
40
),
tree_file_project_path
(
@project
,
@commit
.
id
,
file
),
:remote
=>
:true
=
link_to
truncate
(
content
.
name
,
:length
=>
40
),
tree_file_project_path
(
@project
,
@commit
.
id
,
file
,
:branch
=>
@branch
,
:tag
=>
@tag
),
:remote
=>
:true
%td
=
time_ago_in_words
(
content_commit
.
committed_date
)
ago
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录