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

don't show deleted groups in admin page 

fixes CNVS-23225

test plan
 - see ticket

Change-Id: Ib688992ef51df89b19aacbef0bdd8a4dc0891367
Reviewed-on: https://gerrit.instructure.com/63417
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
This commit is contained in:
Rob Orton 2015-09-16 12:09:48 -06:00
parent 5941f7bd58
commit dbf007afca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/groups_controller.rb
View File

@ -268,7 +268,7 @@ class GroupsController < ApplicationController
if @context.grants_right?(@current_user, session, :manage_groups)
if @domain_root_account.enable_manage_groups2?
categories_json = @categories.map{ |cat| group_category_json(cat, @current_user, session, include: ["progress_url", "unassigned_users_count", "groups_count"]) }
uncategorized = @context.groups.uncategorized.to_a
uncategorized = @context.groups.active.uncategorized.to_a
if uncategorized.present?
json = group_category_json(GroupCategory.uncategorized, @current_user, session)
json["groups"] = uncategorized.map{ |group| group_json(group, @current_user, session) }