kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds #find_group filter.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9748 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-06-01 19:41:06 +00:00
parent d58e5a0a1e
commit dd1cb4a5bf
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/groups_controller.rb
View File

@ -19,6 +19,7 @@ class GroupsController < ApplicationController
layout 'admin' layout 'admin'
before_filter :require_admin before_filter :require_admin
before_filter :find_group, :only => [:show, :edit, :update, :destroy, :add_users, :remove_user, :autocomplete_for_user, :edit_membership, :destroy_membership]
helper :custom_fields helper :custom_fields
@ -32,8 +33,6 @@ class GroupsController < ApplicationController
end end
def show def show
@group = Group.find(params[:id])
respond_to do |format| respond_to do |format|
format.html format.html
format.xml { render :xml => @group } format.xml { render :xml => @group }
@ -68,11 +67,9 @@ class GroupsController < ApplicationController
end end
def edit def edit
@group = Group.find(params[:id], :include => :projects)
end end
def update def update
@group = Group.find(params[:id])
@group.safe_attributes = params[:group] @group.safe_attributes = params[:group]
respond_to do |format| respond_to do |format|
@ -88,7 +85,6 @@ class GroupsController < ApplicationController
end end
def destroy def destroy
@group = Group.find(params[:id])
@group.destroy @group.destroy
respond_to do |format| respond_to do |format|
@ -98,7 +94,6 @@ class GroupsController < ApplicationController
end end
def add_users def add_users
@group = Group.find(params[:id])
users = User.find_all_by_id(params[:user_ids]) users = User.find_all_by_id(params[:user_ids])
@group.users << users if request.post? @group.users << users if request.post?
respond_to do |format| respond_to do |format|
@ -113,7 +108,6 @@ class GroupsController < ApplicationController
end end
def remove_user def remove_user
@group = Group.find(params[:id])
@group.users.delete(User.find(params[:user_id])) if request.delete? @group.users.delete(User.find(params[:user_id])) if request.delete?
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' } format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
@ -122,13 +116,11 @@ class GroupsController < ApplicationController
end end
def autocomplete_for_user def autocomplete_for_user
@group = Group.find(params[:id])
@users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100) @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
render :layout => false render :layout => false
end end
def edit_membership def edit_membership
@group = Group.find(params[:id])
@membership = Member.edit_membership(params[:membership_id], params[:membership], @group) @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
@membership.save if request.post? @membership.save if request.post?
respond_to do |format| respond_to do |format|
@ -151,11 +143,18 @@ class GroupsController < ApplicationController
end end
def destroy_membership def destroy_membership
@group = Group.find(params[:id])
Member.find(params[:membership_id]).destroy if request.post? Member.find(params[:membership_id]).destroy if request.post?
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' } format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'groups/memberships'} } format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'groups/memberships'} }
end end
end end
private
def find_group
@group = Group.find(params[:id])
rescue ActiveRecord::RecordNotFound
render_404
end
end end