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

Rebuild team area

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-14 12:38:43 +02:00
parent f4f36f78dd
commit 441d256188
8 changed files with 81 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/teams/projects_controller.rb
View file

@ -1,20 +1,4 @@
class Teams::ProjectsController < Teams::ApplicationController
skip_before_filter :authorize_manage_user_team!, only: [:index]
def index
@projects = user_team.projects
@avaliable_projects = current_user.admin? ? Project.without_team(user_team) : current_user.owned_projects.without_team(user_team)
end
def new
user_team
@avaliable_projects = current_user.owned_projects.scoped
@avaliable_projects = @avaliable_projects.without_team(user_team) if user_team.projects.any?
redirect_to team_projects_path(user_team), notice: "No avalible projects." unless @avaliable_projects.any?
end
def create
redirect_to :back if params[:project_ids].blank?
@ -28,7 +12,7 @@ class Teams::ProjectsController < Teams::ApplicationController
# Assign projects to team
user_team.assign_to_projects(project_ids, access)
redirect_to team_projects_path(user_team), notice: 'Team of users was successfully assigned to projects.'
redirect_to edit_team_path(user_team), notice: 'Team of users was successfully assigned to projects.'
end
def edit
@ -37,7 +21,7 @@ class Teams::ProjectsController < Teams::ApplicationController
def update
if user_team.update_project_access(team_project, params[:greatest_project_access])
redirect_to team_projects_path(user_team), notice: 'Access was successfully updated.'
redirect_to edit_team_path(user_team), notice: 'Access was successfully updated.'
else
render :edit
end
@ -53,5 +37,4 @@ class Teams::ProjectsController < Teams::ApplicationController
def team_project
@project ||= user_team.projects.find_with_namespace(params[:id])
end
end