GRN2-283: Fixed bug where users can't join a shared room (Fixed bigbl…

…uebutton#989) (bigbluebutton#995) * GRN2-283: Fixed bug where users can't join a shared room * GRN2-283: Fixed bug where users can't join a shared room * GRN2-283: Fixed bug where users can't join a shared room Co-authored-by: Ahmad Farhat <[email protected]>
scheff · Mar 18, 2020 · 84fb615 · 84fb615
1 parent e670260
commit 84fb615
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
@@ -93,7 +93,7 @@ def join
     return redirect_to root_path,
       flash: { alert: I18n.t("administrator.site_settings.authentication.user-info") } if auth_required
 
-    unless @room.owned_by?(current_user)
+    unless @room.owned_by?(current_user) || room_shared_with_user
       # Don't allow users to join unless they have a valid access code or the room doesn't have an access code
       if @room.access_code && !@room.access_code.empty? && @room.access_code != session[:access_code]
         return redirect_to room_path(room_uid: params[:room_uid]), flash: { alert: I18n.t("room.access_code_required") }