Commit dcea5220 authored by Andrey Kumanyaev's avatar Andrey Kumanyaev Committed by Dmitriy Zaporozhets

remove before_filter from controllers

parent f87b76a8
class Admin::Teams::MembersController < Admin::Teams::ApplicationController class Admin::Teams::MembersController < Admin::Teams::ApplicationController
before_filter :team_member, only: [:edit, :destroy, :update]
def new def new
@users = User.active @users = User.active
@users = @users.not_in_team(@team) if @team.members.any? @users = @users.not_in_team(@team) if @team.members.any?
...@@ -19,11 +17,12 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController ...@@ -19,11 +17,12 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
end end
def edit def edit
team_member
end end
def update def update
options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]} options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]}
if @team.update_membership(@member, options) if @team.update_membership(team_member, options)
redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.' redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.'
else else
render :edit render :edit
...@@ -31,16 +30,16 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController ...@@ -31,16 +30,16 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
end end
def destroy def destroy
if @team.remove_member(@member) if @team.remove_member(team_member)
redirect_to admin_team_path(@team), notice: "Member was successfully removed from team." redirect_to admin_team_path(@team), notice: "Member was successfully removed from team."
else else
redirect_to admin_team_members(@team), notice: "Something wrong." redirect_to admin_team_members(@team), notice: "Something wrong."
end end
end end
private protected
def team_member def team_member
@member = @team.members.find(params[:id]) @member ||= @team.members.find(params[:id])
end end
end end
class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
before_filter :team_project, only: [:edit, :destroy, :update]
def new def new
@projects = Project.scoped @projects = Project.scoped
@projects = @projects.without_team(@team) if @team.projects.any? @projects = @projects.without_team(@team) if @team.projects.any?
...@@ -18,10 +16,11 @@ class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController ...@@ -18,10 +16,11 @@ class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
end end
def edit def edit
team_project
end end
def update def update
if @team.update_project_access(@project, params[:greatest_project_access]) if @team.update_project_access(team_project, params[:greatest_project_access])
redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.' redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.'
else else
render :edit render :edit
...@@ -29,14 +28,14 @@ class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController ...@@ -29,14 +28,14 @@ class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
end end
def destroy def destroy
@team.resign_from_project(@project) @team.resign_from_project(team_project)
redirect_to admin_team_path(@team), notice: 'Project was successfully removed.' redirect_to admin_team_path(@team), notice: 'Project was successfully removed.'
end end
private protected
def team_project def team_project
@project = @team.projects.find_by_path(params[:id]) @project ||= @team.projects.find_by_path(params[:id])
end end
end end
class Admin::TeamsController < Admin::ApplicationController class Admin::TeamsController < Admin::ApplicationController
before_filter :user_team,
only: [ :edit, :show, :update, :destroy,
:delegate_projects, :relegate_project,
:add_members, :remove_member ]
def index def index
@teams = UserTeam.order('name ASC') @teams = UserTeam.order('name ASC')
@teams = @teams.search(params[:name]) if params[:name].present? @teams = @teams.search(params[:name]) if params[:name].present?
...@@ -12,11 +7,11 @@ class Admin::TeamsController < Admin::ApplicationController ...@@ -12,11 +7,11 @@ class Admin::TeamsController < Admin::ApplicationController
def show def show
@projects = Project.scoped @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?) #@projects.reject!(&:empty_repo?)
@users = User.active @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 @users = UserDecorator.decorate @users
end end
...@@ -25,15 +20,16 @@ class Admin::TeamsController < Admin::ApplicationController ...@@ -25,15 +20,16 @@ class Admin::TeamsController < Admin::ApplicationController
end end
def edit def edit
user_team
end end
def create def create
@team = UserTeam.new(params[:user_team]) user_team = UserTeam.new(params[:user_team])
@team.path = @team.name.dup.parameterize if @team.name user_team.path = user_team.name.dup.parameterize if user_team.name
@team.owner = current_user user_team.owner = current_user
if @team.save if user_team.save
redirect_to admin_team_path(@team), notice: 'UserTeam was successfully created.' redirect_to admin_team_path(user_team), notice: 'UserTeam was successfully created.'
else else
render action: "new" render action: "new"
end end
...@@ -44,26 +40,26 @@ class Admin::TeamsController < Admin::ApplicationController ...@@ -44,26 +40,26 @@ class Admin::TeamsController < Admin::ApplicationController
owner_id = user_team_params.delete(:owner_id) owner_id = user_team_params.delete(:owner_id)
if owner_id if owner_id
@team.owner = User.find(owner_id) user_team.owner = User.find(owner_id)
end end
if @team.update_attributes(user_team_params) if user_team.update_attributes(user_team_params)
redirect_to admin_team_path(@team), notice: 'UserTeam was successfully updated.' redirect_to admin_team_path(user_team), notice: 'UserTeam was successfully updated.'
else else
render action: "edit" render action: "edit"
end end
end end
def destroy def destroy
@team.destroy user_team.destroy
redirect_to admin_user_teams_path, notice: 'UserTeam was successfully deleted.' redirect_to admin_user_teams_path, notice: 'UserTeam was successfully deleted.'
end end
private protected
def user_team def user_team
@team = UserTeam.find_by_path(params[:id]) @team ||= UserTeam.find_by_path(params[:id])
end end
end end
...@@ -21,11 +21,11 @@ class Teams::ProjectsController < Teams::ApplicationController ...@@ -21,11 +21,11 @@ class Teams::ProjectsController < Teams::ApplicationController
end end
def edit def edit
@user_team = user_team team_project
end end
def update def update
if user_team.update_project_access(project, params[:greatest_project_access]) if user_team.update_project_access(team_project, params[:greatest_project_access])
redirect_to admin_team_path(user_team), notice: 'Membership was successfully updated.' redirect_to admin_team_path(user_team), notice: 'Membership was successfully updated.'
else else
render :edit render :edit
...@@ -33,7 +33,14 @@ class Teams::ProjectsController < Teams::ApplicationController ...@@ -33,7 +33,14 @@ class Teams::ProjectsController < Teams::ApplicationController
end end
def destroy def destroy
user_team.resign_from_project(project) user_team.resign_from_project(team_project)
redirect_to admin_team_path(user_team), notice: 'Project was successfully removed.' redirect_to admin_team_path(user_team), notice: 'Project was successfully removed.'
end end
private
def team_project
@project ||= @team.projects.find_by_path(params[:id])
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment