Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e292d7c1
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 搜索 >>
提交
e292d7c1
编写于
3月 25, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make transfer action in project controller
上级
ff35b37f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
26 deletion
+11
-26
app/contexts/projects/update_context.rb
app/contexts/projects/update_context.rb
+1
-17
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+4
-4
app/models/project.rb
app/models/project.rb
+0
-2
app/views/projects/_form.html.haml
app/views/projects/_form.html.haml
+2
-1
app/views/projects/update_failed.js.haml
app/views/projects/update_failed.js.haml
+0
-2
config/routes.rb
config/routes.rb
+4
-0
未找到文件。
app/contexts/projects/update_context.rb
浏览文件 @
e292d7c1
module
Projects
class
UpdateContext
<
BaseContext
def
execute
(
role
=
:default
)
namespace_id
=
params
[
:project
].
delete
(
:namespace_id
)
params
[
:project
].
delete
(
:namespace_id
)
params
[
:project
].
delete
(
:public
)
unless
can?
(
current_user
,
:change_public_mode
,
project
)
allowed_transfer
=
can?
(
current_user
,
:change_namespace
,
project
)
||
role
==
:admin
if
allowed_transfer
&&
namespace_id
.
present?
if
namespace_id
==
Namespace
.
global_id
if
project
.
namespace
.
present?
# Transfer to global namespace from anyone
project
.
transfer
(
nil
)
end
elsif
namespace_id
.
to_i
!=
project
.
namespace_id
# Transfer to someone namespace
namespace
=
Namespace
.
find
(
namespace_id
)
project
.
transfer
(
namespace
)
end
end
project
.
update_attributes
(
params
[
:project
],
as:
role
)
end
end
...
...
app/controllers/projects_controller.rb
浏览文件 @
e292d7c1
...
...
@@ -4,7 +4,7 @@ class ProjectsController < ProjectResourceController
# Authorize
before_filter
:authorize_read_project!
,
except:
[
:index
,
:new
,
:create
]
before_filter
:authorize_admin_project!
,
only:
[
:edit
,
:update
,
:destroy
]
before_filter
:authorize_admin_project!
,
only:
[
:edit
,
:update
,
:destroy
,
:transfer
]
before_filter
:require_non_empty_project
,
only:
[
:blob
,
:tree
,
:graph
]
layout
'application'
,
only:
[
:new
,
:create
]
...
...
@@ -45,10 +45,10 @@ class ProjectsController < ProjectResourceController
format
.
js
end
end
end
rescue
Project
::
TransferError
=>
ex
@error
=
ex
render
:update_failed
def
transfer
::
Projects
::
TransferContext
.
new
(
project
,
current_user
,
params
).
execute
end
def
show
...
...
app/models/project.rb
浏览文件 @
e292d7c1
...
...
@@ -26,8 +26,6 @@ class Project < ActiveRecord::Base
include
Gitlab
::
ShellAdapter
extend
Enumerize
class
TransferError
<
StandardError
;
end
attr_accessible
:name
,
:path
,
:description
,
:default_branch
,
:issues_tracker
,
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:snippets_enabled
,
:issues_tracker_id
,
:wiki_enabled
,
:public
,
:import_url
,
as:
[
:default
,
:admin
]
...
...
app/views/projects/_form.html.haml
浏览文件 @
e292d7c1
...
...
@@ -107,8 +107,9 @@
-
if
can?
(
current_user
,
:change_namespace
,
@project
)
.ui-box.ui-box-danger
%h5
.title
Transfer project
.errors-holder
.form-holder
=
form_for
(
@project
,
remote:
true
,
html:
{
class:
'transfer-project'
})
do
|
f
|
=
form_for
(
@project
,
url:
transfer_project_path
(
@project
),
remote:
true
,
html:
{
class:
'transfer-project'
})
do
|
f
|
.control-group
=
f
.
label
:namespace_id
do
%span
Namespace
...
...
app/views/projects/update_failed.js.haml
已删除
100644 → 0
浏览文件 @
ff35b37f
:plain
$(".save-project-loader").replaceWith(errorMessage('
#{
escape_javascript
(
@error
.
message
)
}
'));
config/routes.rb
浏览文件 @
e292d7c1
...
...
@@ -167,6 +167,10 @@ Gitlab::Application.routes.draw do
# Project Area
#
resources
:projects
,
constraints:
{
id:
/(?:[a-zA-Z.0-9_\-]+\/)?[a-zA-Z.0-9_\-]+/
},
except:
[
:new
,
:create
,
:index
],
path:
"/"
do
member
do
put
:transfer
end
resources
:blob
,
only:
[
:show
],
constraints:
{
id:
/.+/
}
resources
:tree
,
only:
[
:show
],
constraints:
{
id:
/.+/
,
format:
/(html|js)/
}
resources
:edit_tree
,
only:
[
:show
,
:update
],
constraints:
{
id:
/.+/
},
path:
'edit'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录