DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fix(attachment): keep direct_upload behavior in poll url

Browse source 
Co-Authored-By: Christophe Robillard <christophe.robillard@beta.gouv.fr>
This commit is contained in:
Colin Darie 2023-09-20 16:52:30 +02:00 committed by krichtof
parent c121a8b2dc
commit 44578ba65c
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/attachment/edit_component.rb
View file

@ -83,7 +83,7 @@ class Attachment::EditComponent < ApplicationComponent
if champ.present? if champ.present?
auto_attach_url auto_attach_url
else else
attachment_path(user_can_edit: true, view_as: @view_as, auto_attach_url: @auto_attach_url) attachment_path(user_can_edit: true, view_as: @view_as, auto_attach_url: @auto_attach_url, direct_upload: @direct_upload)
end end
end end

1
app/controllers/attachments_controller.rb
View file

@ -6,6 +6,7 @@ class AttachmentsController < ApplicationController
@attachment = @blob.attachments.find(params[:id]) @attachment = @blob.attachments.find(params[:id])
@user_can_edit = cast_bool(params[:user_can_edit]) @user_can_edit = cast_bool(params[:user_can_edit])
@direct_upload = cast_bool(params[:direct_upload])
@view_as = params[:view_as]&.to_sym @view_as = params[:view_as]&.to_sym
@auto_attach_url = params[:auto_attach_url] @auto_attach_url = params[:auto_attach_url]

2
app/views/attachments/show.turbo_stream.haml
View file

@ -1,5 +1,5 @@
= turbo_stream.replace dom_id(@attachment, :edit) do = turbo_stream.replace dom_id(@attachment, :edit) do
- if @user_can_edit - if @user_can_edit
= render Attachment::EditComponent.new(attachment: @attachment, attached_file: @attachment.record.public_send(@attachment.name), auto_attach_url: @auto_attach_url, view_as: @view_as) = render Attachment::EditComponent.new(attachment: @attachment, attached_file: @attachment.record.public_send(@attachment.name), auto_attach_url: @auto_attach_url, view_as: @view_as, direct_upload: @direct_upload)
- else - else
= render Attachment::ShowComponent.new(attachment: @attachment) = render Attachment::ShowComponent.new(attachment: @attachment)