fix
This commit is contained in:
@@ -20,6 +20,10 @@ class BroadcastPolicy < ApplicationPolicy
|
||||
end
|
||||
|
||||
def destroy_file?
|
||||
if user.nil? || user.user.nil?
|
||||
return false
|
||||
end
|
||||
|
||||
user.manager? || user.account_manager?
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="row">
|
||||
<% show_delete = policy(broadcast).destroy_file? %>
|
||||
<% show_delete = controller.class.module_parent.to_s == "Public" ? false : policy(broadcast).destroy_file? %>
|
||||
<% file_class = show_delete ? "col-8" : "col-12" %>
|
||||
<div class="<%= file_class %>">
|
||||
<li class="my-2" id="<%= dom_id(file) %>">
|
||||
|
||||
@@ -56,7 +56,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
|
||||
describe ".broadcast_file_upload_updates" do
|
||||
it 'broadcasts to the channel with the right data' do
|
||||
broadcast = create(:broadcast, :with_stream, :with_files, skip_create_callback: true)
|
||||
files_content = ApplicationController.render partial: "broadcasts/file", collection: broadcast.files
|
||||
files_content = ApplicationController.render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: broadcast.files
|
||||
|
||||
expect {
|
||||
BroadcastsChannel.broadcast_file_upload_updates(broadcast, broadcast.files, "pagination_content")
|
||||
|
||||
@@ -106,7 +106,7 @@ RSpec.describe Api::BroadcastsController, type: :controller do
|
||||
included = JSON.parse(response.body).dig('included')
|
||||
|
||||
expect(relationships.keys).to include('files')
|
||||
expect(included.size).to eq 1
|
||||
expect(included.size).to eq 3
|
||||
expect(included.first.dig("id")).to eq broadcast.files.first.id.to_s
|
||||
expect(included.first.dig("type")).to eq 'active_storage_attachment'
|
||||
end
|
||||
|
||||
@@ -87,6 +87,7 @@ RSpec.describe Public::BroadcastsController, type: :controller do
|
||||
let!(:broadcast) { create(:broadcast, :with_stream, skip_create_callback: true, project: project ) }
|
||||
|
||||
it "uploads files to broadcast" do
|
||||
allow(BroadcastsChannel).to receive(:broadcast_file_upload_updates)
|
||||
patch :update, params: { token: broadcast.token, broadcast: file_params }, xhr: true
|
||||
|
||||
expect(broadcast.files.count).to eq(1)
|
||||
|
||||
Reference in New Issue
Block a user