forked from External/greenlight
Fixed server recordings 500 if user doesn't have an email (#1254)
Co-authored-by: Jesus Federico <jesus@123it.ca>
This commit is contained in:
parent
3b8b1abb59
commit
2f41b02e72
|
@ -88,7 +88,7 @@ module Recorder
|
||||||
r[:name].downcase.include?(search)) ||
|
r[:name].downcase.include?(search)) ||
|
||||||
r[:participants].include?(search) ||
|
r[:participants].include?(search) ||
|
||||||
!r[:playbacks].select { |p| p[:type].downcase.include?(search) }.empty? ||
|
!r[:playbacks].select { |p| p[:type].downcase.include?(search) }.empty? ||
|
||||||
(search_name && Room.find_by(bbb_id: r[:meetingID]).owner.email.downcase.include?(search))
|
(search_name && recording_owner(r[:meetingID]).downcase.include?(search))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -122,4 +122,11 @@ module Recorder
|
||||||
recs.reverse
|
recs.reverse
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
# Gets the email of the room owner to which the recording belongs to
|
||||||
|
def recording_owner(room_id)
|
||||||
|
Room.find_by(bbb_id: room_id).owner.email.presence || Room.find_by(bbb_id: room_id).owner.username
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,7 +21,7 @@ module AdminsHelper
|
||||||
|
|
||||||
# Gets the email of the room owner to which the recording belongs to
|
# Gets the email of the room owner to which the recording belongs to
|
||||||
def recording_owner_email(room_id)
|
def recording_owner_email(room_id)
|
||||||
Room.find_by(bbb_id: room_id).owner.email
|
Room.find_by(bbb_id: room_id).owner.email.presence || Room.find_by(bbb_id: room_id).owner.username
|
||||||
end
|
end
|
||||||
|
|
||||||
def admin_invite_registration
|
def admin_invite_registration
|
||||||
|
|
Loading…
Reference in New Issue