diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index a88ff483..54990f3a 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -140,8 +140,7 @@ class @Recordings if !@owner table_api.column(-1).visible(false) for recording in data.recordings - totalMinutes = Math.round((new Date(recording.end_time) - new Date(recording.start_time)) / 1000 / 60) - recording.duration = totalMinutes + recording.duration = recording.length data.recordings.sort (a,b) -> return new Date(b.start_time) - new Date(a.start_time) table_api.clear() diff --git a/app/lib/bbb_api.rb b/app/lib/bbb_api.rb index 8fc9a4ca..e7f57c3f 100644 --- a/app/lib/bbb_api.rb +++ b/app/lib/bbb_api.rb @@ -113,7 +113,7 @@ module BbbApi res[:recordings].each do |recording| pref_preview = {} - + recording[:length] = recording[:playback][:format].is_a?(Hash) ? recording[:playback][:format][:length] : recording[:playback][:format].first[:length] # create a playbacks attribute on recording for playback formats recording[:playbacks] = if !recording[:playback] || !recording[:playback][:format] [] diff --git a/app/views/bbb/recordings.jbuilder b/app/views/bbb/recordings.jbuilder index cb6d2423..e1174e8b 100644 --- a/app/views/bbb/recordings.jbuilder +++ b/app/views/bbb/recordings.jbuilder @@ -23,6 +23,7 @@ json.recordings do json.start_time recording[:startTime] json.end_time recording[:endTime] json.published recording[:published] + json.length recording[:length] json.previews do json.array!(recording[:previews]) do |preview| json.partial! 'preview', preview: preview