From 02f59c49e63fbb74168f266aa082c6e966a44e26 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Tue, 31 Jan 2017 12:10:15 -0500 Subject: [PATCH] main room recordings --- app/assets/javascripts/recordings.coffee | 18 +++++++++++++----- config/routes.rb | 9 +++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index af206b5f..98136978 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -157,7 +157,7 @@ class @Recordings # refresh the recordings from the server refresh: -> table_api = this.table.api() - $.get "/rooms/"+Meeting.getInstance().getAdminId()+"/recordings", (data) => + $.get @getRecordingsURL(), (data) => @setOwner(data.is_owner) if !@owner table_api.column(-1).visible(false) @@ -172,11 +172,12 @@ class @Recordings # setup click handlers for the action buttons setupActionHandlers: -> table_api = this.table.api() + recordingsObject = this @getTable().on 'click', '.recording-update', (event) -> btn = $(this) row = table_api.row($(this).closest('tr')).data() - url = $('.meeting-url').val() + url = recordingsObject.getRecordingsURL() id = row.id published = btn.data('visibility') == "unlisted" || @@ -189,7 +190,7 @@ class @Recordings data["meta_" + GreenLight.META_LISTED] = listed.toString(); $.ajax({ method: 'PATCH', - url: url+'/recordings/'+id, + url: url+'/'+id, data: data }).done((data) -> @@ -200,12 +201,12 @@ class @Recordings @getTable().on 'click', '.recording-delete', (event) -> btn = $(this) row = table_api.row($(this).closest('tr')).data() - url = $('.meeting-url').val() + url = recordingsObject.getRecordingsURL() id = row.id btn.prop('disabled', true) $.ajax({ method: 'DELETE', - url: url+'/recordings/'+id + url: url+'/'+id }).done((data) -> ).fail((data) -> @@ -218,6 +219,13 @@ class @Recordings getTable: -> @table + getRecordingsURL: -> + if $(".page-wrapper.rooms").data('main-room') + base_url = '/rooms/'+Meeting.getInstance().getAdminId() + else + base_url = $('.meeting-url').val() + base_url+'/recordings' + isOwner: -> @owner diff --git a/config/routes.rb b/config/routes.rb index f3d7eaa2..954ee7b9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -29,11 +29,12 @@ Rails.application.routes.draw do # meetings offer a landing page for NON authenticated users to create and join session in BigBlueButton # rooms offer a customized landing page for authenticated users to create and join session in BigBlueButton - get '/rooms/:room_id/recordings', to: 'bbb#recordings', defaults: {format: 'json'} - patch '/rooms/:id/recordings/:record_id', to: 'bbb#update_recordings', defaults: {format: 'json'} - delete '/rooms/:id/recordings/:record_id', to: 'bbb#delete_recordings', defaults: {format: 'json'} - get '/rooms/:room_id/:id', to: 'landing#resource', resource: 'rooms' + patch '/rooms/:room_id/recordings/:record_id', to: 'bbb#update_recordings', defaults: {format: 'json'} + delete '/rooms/:room_id/recordings/:record_id', to: 'bbb#delete_recordings', defaults: {format: 'json'} + get '/rooms/:room_id', to: 'landing#resource', resource: 'rooms' + get '/rooms/:room_id/recordings', to: 'bbb#recordings', defaults: {format: 'json'} + get '/rooms/:room_id/:id', to: 'landing#resource', resource: 'rooms' delete '/rooms/:room_id/:id/end', to: 'bbb#end', defaults: {format: 'json'} get '/:resource/:id', to: 'landing#resource', as: :resource