Commit 3250a024 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

1. Improved admin -> new project form

2. Fixed bug: post-receive file was not added when create project via admin
parent f1795a49
......@@ -34,6 +34,8 @@ def team_update
params[:project_access]
)
@admin_project.update_repository
redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.'
end
......
......@@ -47,6 +47,11 @@ def write_hook(name, content)
File.chmod(0775, hook_file)
end
def has_post_receive_file?
hook_file = File.join(path_to_repo, 'hooks', 'post-receive')
File.exists?(hook_file)
end
def tags
repo.tags.map(&:name).sort.reverse
end
......
......@@ -56,11 +56,11 @@
.actions
= f.submit 'Save', :class => "btn primary"
= link_to 'Cancel', [:admin, @admin_project], :class => "btn"
= link_to 'Destroy', [:admin, @admin_project], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger right"
- unless @admin_project.new_record?
= link_to 'Destroy', [:admin, @admin_project], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger right"
:javascript
$(function(){
taggifyForm();
$('#project_owner_id').chosen();
$('#project_default_branch').chosen();
new Projects();
})
......@@ -7,6 +7,7 @@
%th Name
%th Path
%th Team Members
%th Post Receive
%th Last Commit
%th
%th
......@@ -16,6 +17,7 @@
%td= link_to project.name, [:admin, project]
%td= project.path
%td= project.users_projects.count
%td= check_box_tag :post_receive_file, 1, project.has_post_receive_file?, :disabled => true
%td= last_commit(project)
%td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}", :class => "btn small"
%td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger"
......
%h1 New project
%h2 New project
%hr
= render 'form'
%br
= link_to 'Back', admin_projects_path, :class => ''
......@@ -28,6 +28,12 @@
Description:
%td
= @admin_project.description
%tr
%td
%b
Post Receive File:
%td
= check_box_tag :post_receive_file, 1, @admin_project.has_post_receive_file?, :disabled => true
%br
%h3
Team
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment