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

@@ -1,7 +1,7 @@
<% if acquired_media_file_infos.any? %>
<% acquired_media_file_infos.each do |file_info| %>
<li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(file_info.releasable, dom_id(file_info)) %>" data-hidden="false">
<%= render "video_analyses/file_info_releasable", releasable: file_info.releasable, video: video, file_info: file_info %>
<% if acquired_media_files.any? %>
<% acquired_media_files.each do |file| %>
<li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(file.record, dom_id(file)) %>" data-hidden="false">
<%= render "video_analyses/file_releasable", releasable: file.record, video: video, file: file %>
</li>
<% end %>
<% else %>

View File

@@ -1,7 +1,7 @@
<% if acquired_media_release.file_infos.any? %>
<% acquired_media_release.file_infos.each do |file_info| %>
<li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(acquired_media_release, "file_info_#{file_info.id}") %>" data-confirmed="<%= video.has_confirmed_release?(acquired_media_release) && video.video_release_confirmations.any? { |video_release_confirmation| video_release_confirmation.file_info_id == file_info.id } %>" data-hidden="false">
<%= render "video_analyses/file_info_releasable", releasable: acquired_media_release, video: video, file_info: file_info %>
<% if acquired_media_release.files.any? %>
<% acquired_media_release.files.each do |file| %>
<li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(acquired_media_release, "attachment_#{file.id}") %>" data-confirmed="<%= video.has_confirmed_release?(acquired_media_release) && video.video_release_confirmations.any? { |video_release_confirmation| video_release_confirmation.file_id == file.id } %>" data-hidden="false">
<%= render "video_analyses/file_releasable", releasable: acquired_media_release, video: video, file: file %>
</li>
<% end %>
<% else %>

View File

@@ -1,8 +0,0 @@
<%= button_to_video_release_confirmation video, releasable, additional_video_release_params: { file_info_id: file_info.id } do %>
<figure class="figure mb-0">
<div class="figure-img border text-muted d-flex justify-content-center align-items-center text-wrap text-break" style="width:200px;height:200px;">
<%= file_info.filename %>
</div>
<figcaption class="figure-caption text-center"><%= truncate releasable.name, length: 25 %></figcaption>
</figure>
<% end %>

View File

@@ -0,0 +1,12 @@
<%= button_to_video_release_confirmation video, releasable, additional_video_release_params: { file_id: file.id } do %>
<figure class="figure mb-0">
<% if file.content_type.include? "image" %>
<%= image_tag large_variant(file), class: "figure-img border", style: "width:200px;height:200px;" %>
<% else %>
<div class="figure-img border text-muted d-flex justify-content-center align-items-center text-wrap text-break" style="width:200px;height:200px;">
<%= file.filename %>
</div>
<% end %>
<figcaption class="figure-caption text-center"><%= truncate releasable.name, length: 25 %></figcaption>
</figure>
<% end %>

View File

@@ -1,3 +1,18 @@
<li class="releasable list-inline-item hidden-when-confirmed" id="<%= dom_id(material_release) %>" data-confirmed="<%= video.confirmed_material_releases.include?(material_release) %>" data-hidden="<%= video.confirmed_material_releases.include?(material_release) %>">
<%= render "video_analyses/releasable", releasable: material_release, video: video %>
</li>
<% if material_release.files.any? %>
<% material_release.files.each do |file| %>
<li class="releasable list-inline-item hidden-when-confirmed" id="<%= dom_id(material_release) %>" data-ujs-target="<%= dom_id(material_release, "attachment_#{file.id}") %>" data-confirmed="<%= video.confirmed_material_releases.include?(material_release) %>" data-hidden="<%= video.confirmed_material_releases.include?(material_release) %>">
<%= render "video_analyses/file_releasable", releasable: material_release, video: video, file: file %>
</li>
<% end %>
<% else %>
<li class="releasable list-inline-item" data-confirmed="false" data-hidden="false">
<figure class="figure mb-0">
<div class="figure-img border text-muted d-flex justify-content-center align-items-center" style="width:200px;height:200px;">
<small>No File Uploaded</small>
</div>
<figcaption class="figure-caption text-center"><%= truncate material_release.name, length: 25 %></figcaption>
</figure>
</li>
<% end %>

View File

@@ -22,8 +22,8 @@
<td><a data-behavior="seekable-timecode"><%= confirmation.appears_at %></a></td>
<td><%= confirmation.releasable.name %></td>
<td>
<% if confirmation.file_info.present? %>
<%= confirmation.file_info.filename %></div>
<% if confirmation.file_id.present? %>
<%= confirmation.file.filename %></div>
<% elsif confirmation.releasable.respond_to?(:photo) && confirmation.releasable.photo.attached? %>
<%= image_tag thumbnail_variant(confirmation.releasable.photo), class: "img-fluid figure-img" %>
<% else %>

View File

@@ -2,7 +2,7 @@
$("#acquired_media_releases [data-toggle=tooltip]").tooltip("dispose");
// Update the release list
$("#acquired_media_releases").html("<%= j render("video_analyses/acquired_media_file_infos", acquired_media_file_infos: @acquired_media_file_infos, video: @video) %>");
$("#acquired_media_releases").html("<%= j render("video_analyses/acquired_media_files", acquired_media_files: @acquired_media_files, video: @video) %>");
// # Reset the search form
$("#acquired_media_releases_section form input[name='query']").val("<%= params[:query] %>");