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

@@ -14,7 +14,7 @@
<div id="video_release_confirmation_fields">
<%= form.hidden_field :time_elapsed, value: video_release_confirmation.time_elapsed %>
<%= form.hidden_field :file_info_id, value: video_release_confirmation.file_info_id %>
<%= form.hidden_field :file_id, value: video_release_confirmation.file_id %>
<%= form.static_control nil, name: nil, label: "Video Timecode", value: video_release_confirmation.appears_at %>
<%= form.text_field :channel %>
<%= form.text_field :timecode_in %>

View File

@@ -1,8 +1,8 @@
var hideConfirmed = $("input[name=hide_confirmed]:checked").length > 0;
// Mark the release as confirmed
if (<%= @releasable.respond_to?(:file_infos) %>) {
$("[data-ujs-target=<%= dom_id(@releasable, "file_info_#{@video_release_confirmation.file_info_id}") %>]").attr("data-confirmed", true).data("confirmed", true)
if (<%= @releasable.respond_to?(:files) %>) {
$("[data-ujs-target=<%= dom_id(@releasable, "attachment_#{@video_release_confirmation.file_id}") %>]").attr("data-confirmed", true).data("confirmed", true)
} else {
$("#<%= dom_id(@releasable) %>").attr("data-confirmed", true).data("confirmed", true)
}

View File

@@ -1,7 +1,7 @@
// Mark the release as no longer confirmed and show
if (<%= @releasable.respond_to?(:file_infos) && @video_release_confirmation.respond_to?(:file_info_id) %>) {
if (<%= @video_release_confirmations.none? { |video_release_confirmation| video_release_confirmation.respond_to?(:file_info_id) && video_release_confirmation.file_info_id == @video_release_confirmation.file_info_id } %>) {
$("[data-ujs-target=<%= dom_id(@releasable, "file_info_#{@video_release_confirmation.file_info_id}") %>]")
if (<%= @releasable.respond_to?(:files) && @video_release_confirmation.respond_to?(:file_id) %>) {
if (<%= @video_release_confirmations.none? { |video_release_confirmation| video_release_confirmation.respond_to?(:file_id) && video_release_confirmation.file_id == @video_release_confirmation.file_id } %>) {
$("[data-ujs-target=<%= dom_id(@releasable, "attachment_#{@video_release_confirmation.file_id}") %>]")
.attr("data-confirmed", false).data("confirmed", false)
.attr("data-hidden", false).data("hidden", false);
}