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

Added javascript needed to rename from all recordings (#390)

This commit is contained in:
farhatahmad 2019-03-05 17:04:14 -05:00 committed by Jesus Federico
parent ef8fc2c0e4
commit ab6655554c
5 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/rename.js
View File

@ -18,7 +18,7 @@ $(document).on('turbolinks:load', function(){
var controller = $("body").data('controller'); var controller = $("body").data('controller');
var action = $("body").data('action'); var action = $("body").data('action');
if(controller == "rooms" && action == "show" || controller == "rooms" && action == "update"){ if(controller == "rooms" && action == "show" || controller == "rooms" && action == "update" || controller == "users" && action == "recordings"){
// Set a room header rename event // Set a room header rename event
var configure_room_header = function(room_title){ var configure_room_header = function(room_title){
@ -117,14 +117,7 @@ $(document).on('turbolinks:load', function(){
// Apply ajax request depending on the element that triggered the event // Apply ajax request depending on the element that triggered the event
var submit_rename_request = function(element){ var submit_rename_request = function(element){
if(element.data('room-uid')){ if(element.is('#room-title')){
submit_update_request({
setting: "rename_block",
room_block_uid: element.data('room-uid'),
room_name: element.find('#room-name-editable-input').val(),
});
}
else if(element.is('#room-title')){
submit_update_request({ submit_update_request({
setting: "rename_header", setting: "rename_header",
room_name: element.find('#user-text').text(), room_name: element.find('#user-text').text(),
@ -135,15 +128,28 @@ $(document).on('turbolinks:load', function(){
setting: "rename_recording", setting: "rename_recording",
record_id: element.data('recordid'), record_id: element.data('recordid'),
record_name: element.find('text').text(), record_name: element.find('text').text(),
room_uid: element.data('room-uid'),
}); });
} }
} }
// Helper for submitting ajax requests // Helper for submitting ajax requests
var submit_update_request = function(data){ var submit_update_request = function(data){
var update_path = window.location.pathname
if ('room_uid' in data) {
update_path = $("body").data('relative-root')
if (!update_path.endsWith("/")) {
update_path += "/"
}
update_path += data.room_uid
}
// Send ajax request for update // Send ajax request for update
$.ajax({ $.ajax({
url: window.location.pathname, url: update_path,
type: "PATCH", type: "PATCH",
data: data, data: data,
}); });

5
app/assets/javascripts/room.js
View File

@ -55,10 +55,7 @@ $(document).on('turbolinks:load', function(){
// Display and update all fields related to creating a room in the createRoomModal // Display and update all fields related to creating a room in the createRoomModal
$("#create-room").click(function(){ $("#create-room").click(function(){
$("#create-room-name").val("") $("#create-room-name").val("")
$("#createRoomModal form").attr("action", $("body").data('relative-root'))
var relative_url_root = window.location.pathname.split("/")[1];
$("#createRoomModal form").attr("action", "/" + relative_url_root)
updateDropdown($(".dropdown-item[value='default']")) updateDropdown($(".dropdown-item[value='default']"))
$("#room_mute_on_join").prop("checked", false) $("#room_mute_on_join").prop("checked", false)

7
app/controllers/rooms_controller.rb
View File

@ -73,7 +73,12 @@ class RoomsController < ApplicationController
elsif params[:setting] == "rename_recording" elsif params[:setting] == "rename_recording"
@room.update_recording(params[:record_id], "meta_name" => params[:record_name]) @room.update_recording(params[:record_id], "meta_name" => params[:record_name])
end end
redirect_to room_path
if request.referrer
redirect_to request.referrer
else
redirect_to room_path
end
end end
# POST /:room_uid # POST /:room_uid

2
app/views/layouts/application.html.erb
View File

@ -34,7 +34,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>"> <body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>" data-relative-root="<%= Rails.configuration.relative_url_root || "/" %>">
<%= render "shared/header" %> <%= render "shared/header" %>
<div class="wrapper"> <div class="wrapper">

2
app/views/shared/components/_recording_row.html.erb
View File

@ -15,7 +15,7 @@
<tr> <tr>
<td> <td>
<div id="recording-title" class="form-inline edit_hover_class" data-recordid="<%= recording[:recordID] %>"> <div id="recording-title" class="form-inline edit_hover_class" data-recordid="<%= recording[:recordID] %>" data-room-uid="<%= recording[:room_uid] %>">
<text id='recording-text'> <text id='recording-text'>
<% if recording[:metadata][:name] %> <% if recording[:metadata][:name] %>
<%= recording[:metadata][:name] %> <%= recording[:metadata][:name] %>