Merge branch 'issue3199' into development

DMPRoadmap · Aug 15, 2022 · dbbf88d · dbbf88d
2 parents 387e7e6 + bbf34d0
commit dbbf88d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/app/controllers/guidance_groups_controller.rb b/app/controllers/guidance_groups_controller.rb
@@ -23,6 +23,7 @@ def admin_new
   def admin_create
     # Ensure that the user can only create GuidanceGroups for their Org
     args = guidance_group_params.to_h.merge({ org_id: current_user.org.id })
+    @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
     @guidance_group = GuidanceGroup.new(args)
     authorize @guidance_group
 
@@ -46,6 +47,7 @@ def admin_edit
   # PUT /org/admin/guidancegroup/:id/admin_update
   # rubocop:disable Metrics/AbcSize
   def admin_update
+    @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
     @guidance_group = GuidanceGroup.find(params[:id])
     authorize @guidance_group