Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
552b3105
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 搜索 >>
提交
552b3105
编写于
11月 23, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed admin area. Create project only from one place
上级
2b683b0d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
42 addition
and
101 deletion
+42
-101
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+12
-33
app/models/project.rb
app/models/project.rb
+4
-1
app/views/admin/projects/_form.html.haml
app/views/admin/projects/_form.html.haml
+9
-9
app/views/admin/projects/_new_form.html.haml
app/views/admin/projects/_new_form.html.haml
+0
-29
app/views/admin/projects/edit.html.haml
app/views/admin/projects/edit.html.haml
+2
-2
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+3
-3
app/views/admin/projects/new.html.haml
app/views/admin/projects/new.html.haml
+0
-12
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+11
-11
config/routes.rb
config/routes.rb
+1
-1
未找到文件。
app/controllers/admin/projects_controller.rb
浏览文件 @
552b3105
class
Admin::ProjectsController
<
AdminController
before_filter
:
admin_
project
,
only:
[
:edit
,
:show
,
:update
,
:destroy
,
:team_update
]
before_filter
:project
,
only:
[
:edit
,
:show
,
:update
,
:destroy
,
:team_update
]
def
index
@
admin_
projects
=
Project
.
scoped
@
admin_projects
=
@admin_
projects
.
search
(
params
[
:name
])
if
params
[
:name
].
present?
@
admin_projects
=
@admin_
projects
.
order
(
"name ASC"
).
page
(
params
[
:page
]).
per
(
20
)
@projects
=
Project
.
scoped
@
projects
=
@
projects
.
search
(
params
[
:name
])
if
params
[
:name
].
present?
@
projects
=
@
projects
.
order
(
"name ASC"
).
page
(
params
[
:page
]).
per
(
20
)
end
def
show
@users
=
User
.
scoped
@users
=
@users
.
not_in_project
(
@
admin_project
)
if
@admin_
project
.
users
.
present?
@users
=
@users
.
not_in_project
(
@
project
)
if
@
project
.
users
.
present?
@users
=
@users
.
all
end
def
new
@admin_project
=
Project
.
new
end
def
edit
end
def
team_update
@admin_project
.
add_users_ids_to_team
(
params
[
:user_ids
],
params
[
:project_access
])
redirect_to
[
:admin
,
@admin_project
],
notice:
'Project was successfully updated.'
end
def
create
@admin_project
=
Project
.
new
(
params
[
:project
])
@admin_project
.
owner
=
current_user
@project
.
add_users_ids_to_team
(
params
[
:user_ids
],
params
[
:project_access
])
if
@admin_project
.
save
redirect_to
[
:admin
,
@admin_project
],
notice:
'Project was successfully created.'
else
render
action:
"new"
end
redirect_to
[
:admin
,
@project
],
notice:
'Project was successfully updated.'
end
def
update
owner_id
=
params
[
:project
].
delete
(
:owner_id
)
if
owner_id
@
admin_
project
.
owner
=
User
.
find
(
owner_id
)
@project
.
owner
=
User
.
find
(
owner_id
)
end
if
@
admin_project
.
update_attributes
(
params
[
:project
]
)
redirect_to
[
:admin
,
@
admin_
project
],
notice:
'Project was successfully updated.'
if
@
project
.
update_attributes
(
params
[
:project
],
as: :admin
)
redirect_to
[
:admin
,
@project
],
notice:
'Project was successfully updated.'
else
render
action:
"edit"
end
end
def
destroy
@admin_project
.
destroy
redirect_to
admin_projects_url
,
notice:
'Project was successfully deleted.'
end
private
@project
.
destroy
def
admin_project
@admin_project
=
Project
.
find_by_code
(
params
[
:id
])
redirect_to
projects_url
,
notice:
'Project was successfully deleted.'
end
end
app/models/project.rb
浏览文件 @
552b3105
...
...
@@ -28,7 +28,10 @@ class Project < ActiveRecord::Base
include
Team
attr_accessible
:name
,
:path
,
:description
,
:code
,
:default_branch
,
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:wiki_enabled
:wall_enabled
,
:merge_requests_enabled
,
:wiki_enabled
,
as:
[
:default
,
:admin
]
attr_accessible
:namespace_id
,
as: :admin
attr_accessor
:error_code
# Relations
...
...
app/views/admin/projects/_form.html.haml
浏览文件 @
552b3105
...
...
@@ -11,16 +11,13 @@
.input
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"xxlarge"
%hr
.adv_settings
%h6
Advanced settings:
%fieldset
.adv_settings
%legend
Advanced settings:
.clearfix
=
f
.
label
:path
do
Path
.input
.input-prepend
%strong
=
text_field_tag
:ppath
,
@admin_project
.
path_to_repo
,
class:
"xlarge"
,
disabled:
true
=
text_field_tag
:ppath
,
@project
.
path_to_repo
,
class:
"xlarge"
,
disabled:
true
.clearfix
=
f
.
label
:code
do
URL
...
...
@@ -30,6 +27,10 @@
=
f
.
text_field
:code
,
placeholder:
"example"
-
unless
project
.
new_record?
.clearfix
=
f
.
label
:namespace_id
.input
=
f
.
select
:namespace_id
,
namespaces_options
,
{},
{
class:
'chosen'
}
.clearfix
=
f
.
label
:owner_id
.input
=
f
.
select
:owner_id
,
User
.
all
.
map
{
|
user
|
[
user
.
name
,
user
.
id
]
},
{},
{
class:
'chosen'
}
...
...
@@ -40,9 +41,8 @@
.input
=
f
.
select
(
:default_branch
,
project
.
heads
.
map
(
&
:name
),
{},
style:
"width:210px;"
)
-
unless
project
.
new_record?
%hr
.adv_settings
%h6
Features:
%fieldset
.adv_settings
%legend
Features:
.clearfix
=
f
.
label
:issues_enabled
,
"Issues"
...
...
app/views/admin/projects/_new_form.html.haml
已删除
100644 → 0
浏览文件 @
2b683b0d
=
form_for
[
:admin
,
@admin_project
]
do
|
f
|
-
if
@admin_project
.
errors
.
any?
.alert-message.block-message.error
%span
=
@admin_project
.
errors
.
full_messages
.
first
.clearfix.project_name_holder
=
f
.
label
:name
do
Project name is
.input
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"xxlarge"
=
f
.
submit
'Create project'
,
class:
"btn primary project-submit"
%hr
%div
.adv_settings
%h6
Advanced settings:
.clearfix
=
f
.
label
:path
do
Git Clone
.input
.input-prepend
%span
.add-on
=
Gitlab
.
config
.
ssh_path
=
f
.
text_field
:path
,
placeholder:
"example_project"
,
disabled:
!
@admin_project
.
new_record?
%span
.add-on
=
".git"
.clearfix
=
f
.
label
:code
do
URL
.input
.input-prepend
%span
.add-on
=
web_app_url
=
f
.
text_field
:code
,
placeholder:
"example"
app/views/admin/projects/edit.html.haml
浏览文件 @
552b3105
%h3
.page_title
#{
@
admin_project
.
name
}
→
Edit project
%h3
.page_title
#{
@
project
.
name
}
→
Edit project
%hr
=
render
'form'
,
project:
@
admin_
project
=
render
'form'
,
project:
@project
app/views/admin/projects/index.html.haml
浏览文件 @
552b3105
=
render
'admin/shared/projects_head'
%h3
.page_title
Projects
=
link_to
'New Project'
,
new_
admin_
project_path
,
class:
"btn small right"
=
link_to
'New Project'
,
new_project_path
,
class:
"btn small right"
%br
=
form_tag
admin_projects_path
,
method: :get
,
class:
'form-inline'
do
=
text_field_tag
:name
,
params
[
:name
],
class:
"xlarge"
...
...
@@ -16,7 +16,7 @@
%th
Edit
%th
.cred
Danger Zone!
-
@
admin_
projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%tr
%td
=
link_to
project
.
name
,
[
:admin
,
project
]
%td
=
project
.
path
...
...
@@ -24,4 +24,4 @@
%td
=
last_commit
(
project
)
%td
=
link_to
'Edit'
,
edit_admin_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn small"
%td
.bgred
=
link_to
'Destroy'
,
[
:admin
,
project
],
confirm:
"REMOVE
#{
project
.
name
}
? Are you sure?"
,
method: :delete
,
class:
"btn small danger"
=
paginate
@
admin_
projects
,
theme:
"admin"
=
paginate
@projects
,
theme:
"admin"
app/views/admin/projects/new.html.haml
已删除
100644 → 0
浏览文件 @
2b683b0d
.project_new_holder
%h3
.page_title
New Project
%hr
=
render
'new_form'
%div
.save-project-loader.hide
%center
=
image_tag
"ajax_loader.gif"
%h3
Creating project
&
repository. Please wait a few minutes
:javascript
$
(
function
(){
new
Projects
();
});
app/views/admin/projects/show.html.haml
浏览文件 @
552b3105
=
render
'admin/shared/projects_head'
%h3
.page_title
Project:
#{
@
admin_
project
.
name
}
=
link_to
edit_admin_project_path
(
@
admin_
project
),
class:
"btn right"
do
Project:
#{
@project
.
name
}
=
link_to
edit_admin_project_path
(
@project
),
class:
"btn right"
do
%i
.icon-edit
Edit
-
if
!
@
admin_project
.
has_post_receive_file?
&&
@admin_
project
.
has_commits?
-
if
!
@
project
.
has_post_receive_file?
&&
@
project
.
has_commits?
%br
.alert.alert-error
%span
...
...
@@ -25,36 +25,36 @@
%b
Name:
%td
=
@
admin_
project
.
name
=
@project
.
name
%tr
%td
%b
Code:
%td
=
@
admin_
project
.
code
=
@project
.
code
%tr
%td
%b
Path:
%td
=
@admin_project
.
path
%code
=
@project
.
path_to_repo
%tr
%td
%b
Owner:
%td
=
@
admin_
project
.
owner_name
||
'(deleted)'
=
@project
.
owner_name
||
'(deleted)'
%tr
%td
%b
Post Receive File:
%td
=
check_box_tag
:post_receive_file
,
1
,
@
admin_
project
.
has_post_receive_file?
,
disabled:
true
=
check_box_tag
:post_receive_file
,
1
,
@project
.
has_post_receive_file?
,
disabled:
true
%br
%h3
Team
%small
(
#{
@
admin_
project
.
users_projects
.
count
}
)
(
#{
@project
.
users_projects
.
count
}
)
%br
%table
.zebra-striped
%thead
...
...
@@ -64,7 +64,7 @@
%th
Repository Access
%th
-
@
admin_
project
.
users_projects
.
each
do
|
tm
|
-
@project
.
users_projects
.
each
do
|
tm
|
%tr
%td
=
link_to
tm
.
user_name
,
admin_user_path
(
tm
.
user
)
...
...
@@ -75,7 +75,7 @@
%br
%h3
Add new team member
%br
=
form_tag
team_update_admin_project_path
(
@
admin_
project
),
class:
"bulk_import"
,
method: :put
do
=
form_tag
team_update_admin_project_path
(
@project
),
class:
"bulk_import"
,
method: :put
do
%table
.zebra-striped
%thead
%tr
...
...
config/routes.rb
浏览文件 @
552b3105
...
...
@@ -49,7 +49,7 @@ Gitlab::Application.routes.draw do
delete
:remove_project
end
end
resources
:projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
}
do
resources
:projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
}
,
except:
[
:new
,
:create
]
do
member
do
get
:team
put
:team_update
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录