Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
53421e06
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,发现更多精彩内容 >>
提交
53421e06
编写于
10月 15, 2011
作者:
G
gitlabhq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clean controllers
上级
5f8255ac
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
60 addition
and
88 deletion
+60
-88
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+0
-2
app/controllers/keys_controller.rb
app/controllers/keys_controller.rb
+0
-6
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+57
-71
app/controllers/team_members_controller.rb
app/controllers/team_members_controller.rb
+0
-5
app/views/notes/_notes.html.haml
app/views/notes/_notes.html.haml
+1
-0
app/views/projects/_list.html.haml
app/views/projects/_list.html.haml
+0
-3
app/views/projects/_projects_top_menu.html.haml
app/views/projects/_projects_top_menu.html.haml
+2
-1
未找到文件。
app/controllers/commits_controller.rb
浏览文件 @
53421e06
...
...
@@ -21,7 +21,6 @@ class CommitsController < ApplicationController
respond_to
do
|
format
|
format
.
html
# index.html.erb
format
.
js
format
.
json
{
render
json:
@commits
}
end
end
...
...
@@ -33,7 +32,6 @@ class CommitsController < ApplicationController
respond_to
do
|
format
|
format
.
html
# show.html.erb
format
.
js
format
.
json
{
render
json:
@commit
}
end
end
end
app/controllers/keys_controller.rb
浏览文件 @
53421e06
...
...
@@ -3,11 +3,6 @@ class KeysController < ApplicationController
def
index
@keys
=
current_user
.
keys
.
all
respond_to
do
|
format
|
format
.
html
# index.html.erb
format
.
json
{
render
json:
@keys
}
end
end
def
new
...
...
@@ -32,7 +27,6 @@ class KeysController < ApplicationController
respond_to
do
|
format
|
format
.
html
{
redirect_to
keys_url
}
format
.
js
{
render
:nothing
=>
true
}
format
.
json
{
head
:ok
}
end
end
end
app/controllers/projects_controller.rb
浏览文件 @
53421e06
...
...
@@ -8,10 +8,52 @@ class ProjectsController < ApplicationController
def
index
@projects
=
current_user
.
projects
.
all
end
def
new
@project
=
Project
.
new
end
def
edit
end
def
create
@project
=
Project
.
new
(
params
[
:project
])
@project
.
owner
=
current_user
Project
.
transaction
do
@project
.
save!
@project
.
users_projects
.
create!
(
:admin
=>
true
,
:read
=>
true
,
:write
=>
true
,
:user
=>
current_user
)
end
respond_to
do
|
format
|
if
@project
.
valid?
format
.
html
{
redirect_to
@project
,
notice:
'Project was successfully created.'
}
format
.
js
else
format
.
html
{
render
action:
"new"
}
format
.
js
end
end
rescue
Gitosis
::
AccessDenied
render
:js
=>
"location.href = '
#{
errors_gitosis_path
}
'"
and
return
rescue
StandardError
=>
ex
@project
.
errors
.
add
(
:base
,
"Cant save project. Please try again later"
)
respond_to
do
|
format
|
format
.
html
{
render
action:
"new"
}
format
.
js
end
end
def
update
respond_to
do
|
format
|
format
.
html
# index.html.erb
format
.
json
{
render
json:
@projects
}
if
project
.
update_attributes
(
params
[
:project
])
format
.
html
{
redirect_to
project
,
notice:
'Project was successfully updated.'
}
format
.
js
else
format
.
html
{
render
action:
"edit"
}
format
.
js
end
end
end
...
...
@@ -21,20 +63,27 @@ class ProjectsController < ApplicationController
@tree
=
@commit
.
tree
@tree
=
@tree
/
params
[
:path
]
if
params
[
:path
]
respond_to
do
|
format
|
format
.
html
# show.html.erb
format
.
json
{
render
json:
project
}
end
rescue
Grit
::
NoSuchPathError
=>
ex
respond_to
do
|
format
|
format
.
html
{
render
"projects/empty"
}
end
end
def
tree
load_refs
# load @branch, @tag & @ref
#
# Wall
#
def
wall
@notes
=
@project
.
common_notes
@note
=
Note
.
new
end
#
# Repository preview
#
def
tree
load_refs
# load @branch, @tag & @ref
@repo
=
project
.
repo
...
...
@@ -74,77 +123,14 @@ class ProjectsController < ApplicationController
return
render_404
end
def
new
@project
=
Project
.
new
respond_to
do
|
format
|
format
.
html
# new.html.erb
format
.
json
{
render
json:
@project
}
end
end
def
edit
end
def
create
@project
=
Project
.
new
(
params
[
:project
])
@project
.
owner
=
current_user
Project
.
transaction
do
@project
.
save!
@project
.
users_projects
.
create!
(
:admin
=>
true
,
:read
=>
true
,
:write
=>
true
,
:user
=>
current_user
)
end
respond_to
do
|
format
|
if
@project
.
valid?
format
.
html
{
redirect_to
@project
,
notice:
'Project was successfully created.'
}
format
.
js
format
.
json
{
render
json:
@project
,
status: :created
,
location:
@project
}
else
format
.
html
{
render
action:
"new"
}
format
.
js
format
.
json
{
render
json:
@project
.
errors
,
status: :unprocessable_entity
}
end
end
rescue
Gitosis
::
AccessDenied
render
:js
=>
"location.href = '
#{
errors_gitosis_path
}
'"
and
return
rescue
StandardError
=>
ex
@project
.
errors
.
add
(
:base
,
"Cant save project. Please try again later"
)
respond_to
do
|
format
|
format
.
html
{
render
action:
"new"
}
format
.
js
format
.
json
{
render
json:
@project
.
errors
,
status: :unprocessable_entity
}
end
end
def
update
respond_to
do
|
format
|
if
project
.
update_attributes
(
params
[
:project
])
format
.
html
{
redirect_to
project
,
notice:
'Project was successfully updated.'
}
format
.
js
format
.
json
{
head
:ok
}
else
format
.
html
{
render
action:
"edit"
}
format
.
js
format
.
json
{
render
json:
project
.
errors
,
status: :unprocessable_entity
}
end
end
end
def
destroy
project
.
destroy
respond_to
do
|
format
|
format
.
html
{
redirect_to
projects_url
}
format
.
json
{
head
:ok
}
end
end
def
wall
@notes
=
@project
.
common_notes
@note
=
Note
.
new
end
protected
def
project
...
...
app/controllers/team_members_controller.rb
浏览文件 @
53421e06
...
...
@@ -12,7 +12,6 @@ class TeamMembersController < ApplicationController
respond_to
do
|
format
|
format
.
html
# show.html.erb
format
.
js
format
.
json
{
render
json:
@team_member
}
end
end
...
...
@@ -22,7 +21,6 @@ class TeamMembersController < ApplicationController
respond_to
do
|
format
|
format
.
html
# new.html.erb
format
.
js
format
.
json
{
render
json:
@team_member
}
end
end
...
...
@@ -34,11 +32,9 @@ class TeamMembersController < ApplicationController
if
@team_member
.
save
format
.
html
{
redirect_to
@team_member
,
notice:
'Team member was successfully created.'
}
format
.
js
format
.
json
{
render
json:
@team_member
,
status: :created
,
location:
@team_member
}
else
format
.
html
{
render
action:
"new"
}
format
.
js
format
.
json
{
render
json:
@team_member
.
errors
,
status: :unprocessable_entity
}
end
end
end
...
...
@@ -59,7 +55,6 @@ class TeamMembersController < ApplicationController
respond_to
do
|
format
|
format
.
html
{
redirect_to
root_path
}
format
.
json
{
head
:ok
}
format
.
js
{
render
:nothing
=>
true
}
end
end
...
...
app/views/notes/_notes.html.haml
浏览文件 @
53421e06
%ul
#notes-list
-
@notes
.
each
do
|
note
|
-
next
unless
note
.
author
=
render
:partial
=>
"notes/show"
,
:locals
=>
{
:note
=>
note
}
%br
...
...
app/views/projects/_list.html.haml
浏览文件 @
53421e06
-#- if current_user.can_create_project?
= link_to 'New Project', new_project_path, :class => "lbutton vm"
%table
.round-borders
#projects-list
%tr
%th
Name
...
...
app/views/projects/_projects_top_menu.html.haml
浏览文件 @
53421e06
%div
.top_project_menu
%span
=
link_to
'All'
,
projects_path
,
:class
=>
current_page?
(
projects_path
)
?
"current"
:
nil
%span
=
link_to
"New Project"
,
new_project_path
,
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"new"
)
?
"current"
:
nil
-
if
current_user
.
can_create_project?
%span
=
link_to
"New Project"
,
new_project_path
,
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"new"
)
?
"current"
:
nil
%span
.right
=
link_to_function
(
image_tag
(
"list_view_icon.jpg"
),
"switchProjectView()"
,
:style
=>
"border:none;box-shadow:none;"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录