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

update all teams code. refactoring and some corrections

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-23 02:20:27 +04:00 • committed by Dmitriy Zaporozhets
parent 7658f8c151
commit 18bd1c9d30
35 changed files with 332 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/teams/application_controller.rb
View file

@ -2,7 +2,6 @@
#
# Automatically sets the layout and ensures an administrator is logged in
class Admin::Teams::ApplicationController < Admin::ApplicationController
before_filter :user_team
private

18
app/controllers/admin/teams/members_controller.rb
View file

@ -1,7 +1,7 @@
class Admin::Teams::MembersController < Admin::Teams::ApplicationController
def new
@users = User.active
@users = @users.not_in_team(@team) if @team.members.any?
@users = @users.not_in_team(user_team) if user_team.members.any?
@users = UserDecorator.decorate @users
end
@ -10,10 +10,10 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
user_ids = params[:user_ids]
access = params[:default_project_access]
is_admin = params[:group_admin]
@team.add_members(user_ids, access, is_admin)
user_team.add_members(user_ids, access, is_admin)
end
redirect_to admin_team_path(@team), notice: 'Members was successfully added.'
redirect_to admin_team_path(user_team), notice: 'Members was successfully added into Team of users.'
end
def edit
@ -22,24 +22,24 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
def update
options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]}
if @team.update_membership(team_member, options)
redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.'
if user_team.update_membership(team_member, options)
redirect_to admin_team_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
else
render :edit
end
end
def destroy
if @team.remove_member(team_member)
redirect_to admin_team_path(@team), notice: "Member was successfully removed from team."
if user_team.remove_member(team_member)
redirect_to admin_team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
else
redirect_to admin_team_members(@team), notice: "Something wrong."
redirect_to admin_team_members(user_team), notice: "Something is wrong."
end
end
protected
def team_member
@member ||= @team.members.find(params[:id])
@member ||= user_team.members.find(params[:id])
end
end

16
app/controllers/admin/teams/projects_controller.rb
View file

@ -1,7 +1,7 @@
class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
def new
@projects = Project.scoped
@projects = @projects.without_team(@team) if @team.projects.any?
@projects = @projects.without_team(user_team) if user_team.projects.any?
#@projects.reject!(&:empty_repo?)
end
@ -9,10 +9,10 @@ class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
unless params[:project_ids].blank?
project_ids = params[:project_ids]
access = params[:greatest_project_access]
@team.assign_to_projects(project_ids, access)
user_team.assign_to_projects(project_ids, access)
end
redirect_to admin_team_path(@team), notice: 'Projects was successfully added.'
redirect_to admin_team_path(user_team), notice: 'Team of users was successfully assgned to projects.'
end
def edit
@ -20,22 +20,22 @@ class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
end
def update
if @team.update_project_access(team_project, params[:greatest_project_access])
redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.'
if user_team.update_project_access(team_project, params[:greatest_project_access])
redirect_to admin_team_path(user_team), notice: 'Access was successfully updated.'
else
render :edit
end
end
def destroy
@team.resign_from_project(team_project)
redirect_to admin_team_path(@team), notice: 'Project was successfully removed.'
user_team.resign_from_project(team_project)
redirect_to admin_team_path(user_team), notice: 'Team of users was successfully reassigned from project.'
end
protected
def team_project
@project ||= @team.projects.find_by_path(params[:id])
@project ||= user_team.projects.find_with_namespace(params[:id])
end
end