ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deleted users showing up in the groups list 

...and possibly other places as well.  Seems like the
default should be to not include deleted users in
any result set.

fixes #3741

Change-Id: I87caaaa2ea69f303e20cbbd259663411b4a9ce89
Reviewed-on: https://gerrit.instructure.com/2201
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
This commit is contained in:
Brian Whitmer 2011-02-08 10:15:49 -07:00
parent f3e702a264
commit 893aa8af13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/group.rb
View File

@ -21,8 +21,8 @@ class Group < ActiveRecord::Base
include Workflow
attr_accessible :name, :context, :max_membership, :category, :join_level, :default_view
has_many :group_memberships, :dependent => :destroy
has_many :users, :through => :group_memberships
has_many :group_memberships, :dependent => :destroy, :conditions => ['group_memberships.workflow_state != ?', 'deleted']
has_many :users, :through => :group_memberships, :conditions => ['users.workflow_state != ?', 'deleted']
has_many :participating_group_memberships, :class_name => "GroupMembership", :conditions => ['group_memberships.workflow_state = ?', 'accepted']
has_many :participating_users, :source => :user, :through => :participating_group_memberships
has_many :invited_group_memberships, :class_name => "GroupMembership", :conditions => ['group_memberships.workflow_state = ?', 'invited']