deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add users to project from admin area easily

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-21 19:03:47 +02:00
parent fa8c0c7813
commit c5a48a6a90
3 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/admin/projects_controller.rb
View file

@ -9,6 +9,12 @@ class Admin::ProjectsController < ApplicationController
def show
@admin_project = Project.find_by_code(params[:id])
@users = if @admin_project.users.empty?
User
else
User.not_in_project(@admin_project)
end.all
end
def new
@ -19,11 +25,6 @@ class Admin::ProjectsController < ApplicationController
@admin_project = Project.find_by_code(params[:id])
end
def team
@admin_project = Project.find_by_code(params[:id])
@users = User.not_in_project(@admin_project).all
end
def team_update
@admin_project = Project.find_by_code(params[:id])

38
app/views/admin/projects/show.html.haml
View file

@ -38,6 +38,23 @@
%h2 Team
= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
%table
%thead
%tr
%th Users
%th Project Access:
%th Repo Access:
%tr
%td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), :multiple => true
%td= select_tag :project_access, options_for_select(Project.access_options), :class => "project-access-select"
%td= select_tag :repo_access, options_for_select(Repository.access_options), :class => "repo-access-select"
%tr
%td{ :colspan => 3 }
= submit_tag 'Add', :class => "positive-button"
%table.round-borders
%thead
%tr
@ -52,9 +69,22 @@
%td
= link_to tm.user_name, admin_team_member_path(tm)
%td= time_ago_in_words(tm.updated_at) + " ago"
%td= select_tag :project_access, options_for_select(Project.access_options, tm.project_access), :class => "project-access-select", :disabled => :disabled
%td= select_tag :repo_access, options_for_select(Repository.access_options, tm.repo_access), :class => "repo-access-select", :disabled => :disabled
%td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), :class => "project-access-select", :disabled => :disabled
%td= select_tag :tm_repo_access, options_for_select(Repository.access_options, tm.repo_access), :class => "repo-access-select", :disabled => :disabled
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "grey-button"
.right= link_to 'Bulk Import', team_admin_project_path(@admin_project), :class => "grey-button"
:css
form select {
width:150px;
}
#user_ids {
width:300px;
}
:javascript
$('select#user_ids').chosen();
$('select#repo_access').chosen();
$('select#project_access').chosen();

30
app/views/admin/projects/team.html.haml
View file

@ -1,30 +0,0 @@
= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
.span-6
%b Project Access:
.span-6
= select_tag :project_access, options_for_select(Project.access_options), :class => "project-access-select"
.span-6
%b Repository Access:
.span-6
= select_tag :repo_access, options_for_select(Repository.access_options), :class => "repo-access-select"
%br
= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), :multiple => true
%br
.clear
%br
.actions
= submit_tag 'Save', :class => "grey-button"
:css
form select {
width:300px;
}
:javascript
$('select#user_ids').chosen();
$('select#repo_access').chosen();
$('select#project_access').chosen();