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

fix tests

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-23 23:39:47 +04:00 • committed by Dmitriy Zaporozhets
parent eb99feb4a7
commit 690db9693f
10 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/admin/teams/members_controller.rb
View file

@ -30,11 +30,8 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
end
def destroy
if user_team.remove_member(team_member)
redirect_to admin_team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
else
redirect_to admin_team_members(user_team), notice: "Something is wrong."
end
user_team.remove_member(team_member)
redirect_to admin_team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
end
protected

11
app/controllers/teams/members_controller.rb
View file

@ -20,7 +20,7 @@ class Teams::MembersController < Teams::ApplicationController
user_team.add_members(user_ids, access, is_admin)
end
redirect_to team_path(user_team), notice: 'Members was successfully added into Team of users.'
redirect_to team_members_path(user_team), notice: 'Members was successfully added into Team of users.'
end
def edit
@ -30,18 +30,15 @@ class Teams::MembersController < Teams::ApplicationController
def update
options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]}
if user_team.update_membership(team_member, options)
redirect_to team_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
redirect_to team_members_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
else
render :edit
end
end
def destroy
if user_team.remove_member(team_member)
redirect_to team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
else
redirect_to team_members(user_team), notice: "Something is wrong."
end
user_team.remove_member(team_member)
redirect_to team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
end
protected

6
app/views/admin/teams/show.html.haml
View file

@ -52,7 +52,7 @@
%th Team access
%th.cred.span3 Danger Zone!
- @team.members.each do |member|
%tr.member
%tr.member{ class: "user_#{member.id}"}
%td
= link_to [:admin, member] do
= member.name
@ -62,7 +62,7 @@
%td.bgred
= link_to 'Edit', edit_admin_team_member_path(@team, member), class: "btn small"
&nbsp;
= link_to 'Remove', admin_team_member_path(@team, member), confirm: 'Remove member from team. Are you sure?', method: :delete, class: "btn danger small"
= link_to 'Remove', admin_team_member_path(@team, member), confirm: 'Remove member from team. Are you sure?', method: :delete, class: "btn danger small", id: "remove_member_#{member.id}"
%fieldset
%legend
@ -84,7 +84,7 @@
%td.bgred
= link_to 'Edit', edit_admin_team_project_path(@team, project), class: "btn small"
&nbsp;
= link_to 'Relegate', admin_team_project_path(@team, project), confirm: 'Remove project from team. Are you sure?', method: :delete, class: "btn danger small"
= link_to 'Relegate', admin_team_project_path(@team, project), confirm: 'Remove project from team. Are you sure?', method: :delete, class: "btn danger small", id: "relegate_project_#{project.id}"
:javascript
$(function(){

2
app/views/teams/projects/index.html.haml
View file

@ -13,7 +13,7 @@
%hr
%table
%table.projects-table
%thead
%tr
%th Project name