Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2011-10-21 23:44:08 +0400
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2011-10-21 23:44:08 +0400
commit2db342a4f0f4a6b0dafda4ced194c123f8be6182 (patch)
tree59223a8eb7a86572aede553af7f02705c4b73834 /app
parent49cbcade60e9db1bf47553111d148dd13a132194 (diff)
test cov
Diffstat (limited to 'app')
-rw-r--r--app/controllers/team_members_controller.rb28
1 files changed, 7 insertions, 21 deletions
diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 5fb2710dad7..84addf8d7bb 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -8,35 +8,16 @@ class TeamMembersController < ApplicationController
def show
@team_member = project.users_projects.find(params[:id])
-
- respond_to do |format|
- format.html # show.html.erb
- format.js
- end
end
def new
@team_member = project.users_projects.new
-
- respond_to do |format|
- format.html # new.html.erb
- format.js
- end
end
def create
@team_member = UsersProject.new(params[:team_member])
@team_member.project = project
-
- respond_to do |format|
- if @team_member.save
- format.html { redirect_to @team_member, notice: 'Team member was successfully created.' }
- format.js
- else
- format.html { render action: "new" }
- format.js
- end
- end
+ @team_member.save
end
def update
@@ -45,7 +26,12 @@ class TeamMembersController < ApplicationController
respond_to do |format|
format.js
- format.html { redirect_to team_project_path(@project)}
+ format.html do
+ unless @team_member.valid?
+ flash[:alert] = "User should have at least one role"
+ end
+ redirect_to team_project_path(@project)
+ end
end
end