lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #125 from zach-chai/participants 

add participants to recordings table
This commit is contained in:
Zachary Chai 2017-02-21 10:44:43 -05:00 committed by GitHub
parent 47464d35b2 4d1bbe76a3
commit 38ffce7d10
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/javascripts/recordings.coffee
View File

@ -20,16 +20,21 @@ _recordingsInstance = null
class @Recordings class @Recordings
# adding or removing a column will require updates to all subsequent column positions # adding or removing a column will require updates to all subsequent column positions
COLUMN = { COLUMNS = [
DATE: 0, 'DATE',
NAME: 1, 'NAME',
PREVIEW: 2, 'PREVIEW',
DURATION: 3, 'DURATION',
PLAYBACK: 4, 'PARTICIPANTS',
VISIBILITY: 5, 'PLAYBACK',
LISTED: 6, 'VISIBILITY',
ACTION: 7 'LISTED',
} 'ACTION'
]
COLUMN = {}
i = 0
for c in COLUMNS
COLUMN[c] = i++
constructor: -> constructor: ->
# configure the datatable for recordings # configure the datatable for recordings
@ -48,7 +53,8 @@ class @Recordings
{ data: "start_time" }, { data: "start_time" },
{ data: "name", visible: $(".page-wrapper.rooms").data('main-room') }, { data: "name", visible: $(".page-wrapper.rooms").data('main-room') },
{ data: "previews", orderable: false }, { data: "previews", orderable: false },
{ data: "duration", orderable: false }, { data: "duration" },
{ data: "participants" },
{ data: "playbacks", orderable: false }, { data: "playbacks", orderable: false },
{ data: "published" }, { data: "published" },
{ data: "listed", visible: false }, { data: "listed", visible: false },

5
app/views/bbb/recordings.jbuilder
View File

@ -25,6 +25,11 @@ json.recordings do
json.published recording[:published] json.published recording[:published]
json.length recording[:length] json.length recording[:length]
json.listed recording[:listed] json.listed recording[:listed]
if recording[:participants].is_a? String
json.participants recording[:participants]
else
json.participants nil
end
json.previews do json.previews do
json.array!(recording[:previews]) do |preview| json.array!(recording[:previews]) do |preview|
json.partial! 'preview', preview: preview json.partial! 'preview', preview: preview

1
app/views/landing/rooms.html.erb
View File

@ -35,6 +35,7 @@
<th><%= t('name') %></th> <th><%= t('name') %></th>
<th><%= t('thumbnails') %></th> <th><%= t('thumbnails') %></th>
<th><%= t('duration') %></th> <th><%= t('duration') %></th>
<th><%= t('participants') %></th>
<th></th> <th></th>
<th><%= t('visibility') %></th> <th><%= t('visibility') %></th>
<th>published</th> <th>published</th>

1
config/locales/en-us.yml
View File

@ -111,6 +111,7 @@ en-US:
phrase1: "One of your recordings has just been made available." phrase1: "One of your recordings has just been made available."
phrase2: "Access the following website to view it and publish to other users: %{url}" phrase2: "Access the following website to view it and publish to other users: %{url}"
subject: "Your recording is ready!" subject: "Your recording is ready!"
participants: Users
past_recordings: Past Recordings past_recordings: Past Recordings
presentation: Presentation presentation: Presentation
previous_meetings: (previous meetings) previous_meetings: (previous meetings)