senaduka/old-holivud2
1
0
Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Upstream sync

Browse Source
This commit is contained in:
Senad Uka
2020-06-18 16:56:11 +02:00
parent a7b90c223b
commit 1168bcdfdd
11 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/broadcasts_controller.rb
View File

@@ -24,8 +24,12 @@ class Api::BroadcastsController < Api::ApiController
def update
file_params.each do |file|
file[:io] = StringIO.new(Base64.decode64(file[:io]))
@broadcast.files.attach(io: file[:io], filename: file[:filename])
if file.is_a?(String)
@broadcast.files.attach(file)
else
file[:io] = StringIO.new(Base64.decode64(file[:io]))
@broadcast.files.attach(file.to_h.symbolize_keys)
end
end
@broadcast.save!

4
app/controllers/release_template_imports_controller.rb
View File

@@ -11,7 +11,9 @@ class ReleaseTemplateImportsController < ApplicationController
templates = []
filtered_contract_templates.each do |contract_template|
next if contract_template.duplicated? || contract_template.project == @project
next if contract_template.duplicated? ||
contract_template.archived? ||
contract_template.project == @project
already_imported = contract_template.duplicates.non_archived.pluck(:project_id).include?(@project.id)
templates << OpenStruct.new(template: contract_template, already_imported?: already_imported)