Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Bugfixing in memberships-filter.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-02-02 17:28:59 +01:00
parent aec93d4b73
commit f7b9582261
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/memberships_controller.rb
View file

@ -2,18 +2,16 @@ class MembershipsController < ApplicationController
before_filter :authenticate_membership_or_admin
def add_member
@group = Group.find(params[:group_id])
user = User.find(params[:user_id])
Membership.create(:group => @group, :user => user)
redirect_to :action => 'reload', :group_id => @group
redirect_to :action => 'reload', :id => @group
end
def drop_member
begin
group = Group.find(params[:group_id])
Membership.find(params[:membership_id]).destroy
if User.find(@current_user.id).role_admin?
redirect_to :action => 'reload', :group_id => group
redirect_to :action => 'reload', :id => @group
else
# If the user drops himself from admin group
flash[:notice] = MESG_NO_ADMIN_ANYMORE
@ -21,12 +19,11 @@ class MembershipsController < ApplicationController
end
rescue => error
flash[:error] = error.to_s
redirect_to :action => 'reload', :group_id => group
redirect_to :action => 'reload', :id => @group
end
end
def reload
@group = Group.find(params[:group_id])
render :update do |page|
page.replace_html 'members', :partial => 'shared/memberships/current_members', :object => @group
page.replace_html 'non_members', :partial => 'shared/memberships/non_members', :object => @group