merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allowed admins to share room with themselves (#2442)

This commit is contained in:
Ahmad Farhat 2021-01-18 18:34:42 -05:00 committed by GitHub
parent 0e8e188e24
commit 957bf88a85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ $(document).on('turbolinks:load', function(){
$(".share-room").click(function() { $(".share-room").click(function() {
// Update the path of save button // Update the path of save button
$("#save-access").attr("data-path", $(this).data("path")) $("#save-access").attr("data-path", $(this).data("path"))
$("#room-owner-uid").val($(this).data("owner"))
// Get list of users shared with and display them // Get list of users shared with and display them
displaySharedUsers($(this).data("users-path")) displaySharedUsers($(this).data("users-path"))
@ -82,7 +83,7 @@ $(document).on('turbolinks:load', function(){
$(".bs-searchbox").siblings().hide() $(".bs-searchbox").siblings().hide()
} else { } else {
// Manually populate the dropdown // Manually populate the dropdown
$.get($("#share-room-select").data("path"), { search: $(".bs-searchbox input").val() }, function(users) { $.get($("#share-room-select").data("path"), { search: $(".bs-searchbox input").val(), owner_uid: $("#room-owner-uid").val() }, function(users) {
$(".select-options").remove() $(".select-options").remove()
if (users.length > 0) { if (users.length > 0) {
users.forEach(function(user) { users.forEach(function(user) {

2
app/controllers/users_controller.rb
View File

@ -209,7 +209,7 @@ class UsersController < ApplicationController
roles_can_appear << role.name if role.get_permission("can_appear_in_share_list") && role.priority >= 0 roles_can_appear << role.name if role.get_permission("can_appear_in_share_list") && role.priority >= 0
end end
initial_list = User.where.not(uid: current_user.uid) initial_list = User.where.not(uid: params[:owner_uid])
.with_role(roles_can_appear) .with_role(roles_can_appear)
.shared_list_search(params[:search]) .shared_list_search(params[:search])
.pluck_to_hash(:uid, :name) .pluck_to_hash(:uid, :name)

2
app/views/admins/components/_server_room_row.html.erb
View File

@ -74,7 +74,7 @@
</a> </a>
<% end %> <% end %>
<% if shared_access_allowed %> <% if shared_access_allowed %>
<a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>"> <a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>" data-owner="<%= room.owner.uid %>">
<i class="dropdown-icon fas fa-users"></i> <%= t("room.share") %> <i class="dropdown-icon fas fa-users"></i> <%= t("room.share") %>
</a> </a>
<% end %> <% end %>

2
app/views/rooms/components/_room_block.html.erb
View File

@ -56,7 +56,7 @@
</a> </a>
<% end %> <% end %>
<% if shared_access_allowed %> <% if shared_access_allowed %>
<a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>"> <a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>" data-owner="<%= room.owner.uid %>">
<i class="dropdown-icon fas fa-users"></i> <%= t("room.share") %> <i class="dropdown-icon fas fa-users"></i> <%= t("room.share") %>
</a> </a>
<% end %> <% end %>

1
app/views/shared/modals/_share_room_modal.html.erb
View File

@ -28,6 +28,7 @@
<ul id="user-list" class="list-group"> <ul id="user-list" class="list-group">
</ul> </ul>
</div> </div>
<input id="room-owner-uid" type="hidden">
<div class="mt-6"> <div class="mt-6">
<button id="save-access" class="btn btn-primary btn-block" onclick="saveAccessChanges()" ><%= t("modal.share_access.save") %></button> <button id="save-access" class="btn btn-primary btn-block" onclick="saveAccessChanges()" ><%= t("modal.share_access.save") %></button>
<button class="btn btn-secondary text-primary btn-block" onclick="$('#shareRoomModal').modal('hide')"><%= t("modal.share_access.cancel_changes") %></button> <button class="btn btn-secondary text-primary btn-block" onclick="$('#shareRoomModal').modal('hide')"><%= t("modal.share_access.cancel_changes") %></button>