diff options
| author | Andrew8xx8 <avk@8xx8.ru> | 2013-03-24 11:57:15 +0400 |
|---|---|---|
| committer | Andrew8xx8 <avk@8xx8.ru> | 2013-03-24 11:57:15 +0400 |
| commit | 617239000762a01c57b35cbb699f155622ae921a (patch) | |
| tree | 91ec2cf73954339febb0e59d8293b3fbe972add3 | |
| parent | b49cfbc1d54b6cfa674ba803b3a90fb81c609c8b (diff) | |
| download | gitlab-ce-617239000762a01c57b35cbb699f155622ae921a.tar.gz | |
User Teams specific code moved to user_teams controller
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/projects/teams_controller.rb | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 7e4776d2d75..49e514a228e 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -1,11 +1,3 @@ class Projects::ApplicationController < ApplicationController - before_filter :authorize_admin_team_member! - - protected - - def user_team - @team ||= UserTeam.find_by_path(params[:id]) - end - end diff --git a/app/controllers/projects/teams_controller.rb b/app/controllers/projects/teams_controller.rb index 17e7367364a..c7d51b84fc4 100644 --- a/app/controllers/projects/teams_controller.rb +++ b/app/controllers/projects/teams_controller.rb @@ -1,5 +1,7 @@ class Projects::TeamsController < Projects::ApplicationController + before_filter :authorize_admin_team_member! + def available @teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams @teams = @teams.without_project(project) @@ -24,4 +26,9 @@ class Projects::TeamsController < Projects::ApplicationController redirect_to project_team_index_path(project) end + protected + + def user_team + @team ||= UserTeam.find_by_path(params[:id]) + end end |