From 36d464427df6da504a82c0552260662187ca894f Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 18 Jul 2016 14:24:45 -0700 Subject: [PATCH] Fixed "Your Workshops" for admins --- app/controllers/conferences_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index e12c1bf..44432d9 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -727,7 +727,7 @@ class ConferencesController < ApplicationController # put wach workshop into the correct array Workshop.where(conference_id: @this_conference.id).each do | workshop | - if workshop.can_edit?(current_user) + if workshop.creator?(current_user) || workshop.collaborator?(current_user) @my_workshops << workshop elsif workshop.needs_facilitators @workshops_in_need << workshop