diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 03462349..d97e0b94 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -20,16 +20,21 @@ _recordingsInstance = null class @Recordings # adding or removing a column will require updates to all subsequent column positions - COLUMN = { - DATE: 0, - NAME: 1, - PREVIEW: 2, - DURATION: 3, - PLAYBACK: 4, - VISIBILITY: 5, - LISTED: 6, - ACTION: 7 - } + COLUMNS = [ + 'DATE', + 'NAME', + 'PREVIEW', + 'DURATION', + 'PARTICIPANTS', + 'PLAYBACK', + 'VISIBILITY', + 'LISTED', + 'ACTION' + ] + COLUMN = {} + i = 0 + for c in COLUMNS + COLUMN[c] = i++ constructor: -> # configure the datatable for recordings @@ -48,7 +53,8 @@ class @Recordings { data: "start_time" }, { data: "name", visible: $(".page-wrapper.rooms").data('main-room') }, { data: "previews", orderable: false }, - { data: "duration", orderable: false }, + { data: "duration" }, + { data: "participants" }, { data: "playbacks", orderable: false }, { data: "published" }, { data: "listed", visible: false }, diff --git a/app/views/bbb/recordings.jbuilder b/app/views/bbb/recordings.jbuilder index b7f7d7cc..56f96a45 100644 --- a/app/views/bbb/recordings.jbuilder +++ b/app/views/bbb/recordings.jbuilder @@ -25,6 +25,11 @@ json.recordings do json.published recording[:published] json.length recording[:length] json.listed recording[:listed] + if recording[:participants].is_a? String + json.participants recording[:participants] + else + json.participants nil + end json.previews do json.array!(recording[:previews]) do |preview| json.partial! 'preview', preview: preview diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index 95a24dd2..8c31e099 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -35,6 +35,7 @@ <%= t('name') %> <%= t('thumbnails') %> <%= t('duration') %> + <%= t('participants') %> <%= t('visibility') %> published diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index fb58117e..6220d31c 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -111,6 +111,7 @@ en-US: phrase1: "One of your recordings has just been made available." phrase2: "Access the following website to view it and publish to other users: %{url}" subject: "Your recording is ready!" + participants: Users past_recordings: Past Recordings presentation: Presentation previous_meetings: (previous meetings)