Upstream sync

This commit is contained in:
Senad Uka
2020-09-16 05:39:08 +02:00
parent 5cf7be6f13
commit 28e0eb36b7
61 changed files with 419 additions and 268 deletions

View File

@@ -2,7 +2,7 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
before_action :set_video
def index
@acquired_media_file_infos = filtered_file_infos
@acquired_media_files = filtered_files
end
private
@@ -15,12 +15,12 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
params[:query]
end
def filtered_file_infos
def filtered_files
releasables = policy_scope(@video.acquired_media_releases)
results = FileInfo.where(releasable: releasables)
results = ActiveStorage::Attachment.where(record: releasables, name: "files")
if query_param.present?
results = results.search_filename(query_param)
results = results.joins(:blob).where("active_storage_blobs.filename ILIKE ?", "%#{query_param}%")
end
results