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

refactoring project team members controller (corresponding mental model)

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-22 21:20:39 +04:00 • committed by Dmitriy Zaporozhets
parent ccf8fa4fa2
commit f6f414ce3b
8 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/team_members_controller.rb
View file

@ -7,12 +7,12 @@ class TeamMembersController < ProjectResourceController
end
def show
@team_member = project.users_projects.find(params[:id])
@events = @team_member.user.recent_events.where(:project_id => @project.id).limit(7)
@user_project_relation = project.users_projects.find_by_user_id(member)
@events = member.recent_events.in_projects(project).limit(7)
end
def new
@team_member = project.users_projects.new
@user_project_relation = project.users_projects.new
end
def create
@ -28,18 +28,18 @@ class TeamMembersController < ProjectResourceController
end
def update
@team_member = project.users_projects.find(params[:id])
@team_member.update_attributes(params[:team_member])
@user_project_relation = project.users_projects.find_by_user_id(member)
@user_project_relation.update_attributes(params[:team_member])
unless @team_member.valid?
unless @user_project_relation.valid?
flash[:alert] = "User should have at least one role"
end
redirect_to project_team_index_path(@project)
end
def destroy
@team_member = project.users_projects.find(params[:id])
@team_member.destroy
@user_project_relation = project.users_projects.find_by_user_id(params[:id])
@user_project_relation.destroy
respond_to do |format|
format.html { redirect_to project_team_index_path(@project) }
@ -54,4 +54,10 @@ class TeamMembersController < ProjectResourceController
redirect_to project_team_members_path(project), notice: notice
end
protected
def member
@member ||= User.find(params[:id])
end
end