diff options
author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-07-31 09:32:49 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-07-31 09:32:49 +0400 |
commit | 5926bbac12d5831e1ad90964272b96e152a72e34 (patch) | |
tree | e222160f8f35e7dd772dbd124eef089592efc9c2 /app/controllers/admin/projects_controller.rb | |
parent | 69e41250d1b1eea609ae63f2702d5888396cba9a (diff) |
Backend Refactoring
Diffstat (limited to 'app/controllers/admin/projects_controller.rb')
-rw-r--r-- | app/controllers/admin/projects_controller.rb | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 0ff97bf2c32..17009946383 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -2,6 +2,7 @@ class Admin::ProjectsController < ApplicationController layout "admin" before_filter :authenticate_user! before_filter :authenticate_admin! + before_filter :admin_project, :only => [:edit, :show, :update, :destroy, :team_update] def index @admin_projects = Project.scoped @@ -10,13 +11,9 @@ class Admin::ProjectsController < ApplicationController end 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 + @users = User.scoped + @users = @users.not_in_project(@admin_project) if @admin_project.users.present? + @users = @users.all end def new @@ -24,19 +21,10 @@ class Admin::ProjectsController < ApplicationController end def edit - @admin_project = Project.find_by_code(params[:id]) end def team_update - @admin_project = Project.find_by_code(params[:id]) - - UsersProject.bulk_import( - @admin_project, - params[:user_ids], - params[:project_access] - ) - - @admin_project.update_repository + @admin_project.add_users_ids_to_team(params[:user_ids], params[:project_access]) redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.' end @@ -53,8 +41,6 @@ class Admin::ProjectsController < ApplicationController end def update - @admin_project = Project.find_by_code(params[:id]) - owner_id = params[:project].delete(:owner_id) if owner_id @@ -69,9 +55,14 @@ class Admin::ProjectsController < ApplicationController end def destroy - @admin_project = Project.find_by_code(params[:id]) @admin_project.destroy redirect_to admin_projects_url, notice: 'Project was successfully deleted.' end + + private + + def admin_project + @admin_project = Project.find_by_code(params[:id]) + end end |