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

@@ -18,7 +18,7 @@ class ContractTemplate < ApplicationRecord
has_many :medical_releases, dependent: :restrict_with_error
has_many :misc_releases, dependent: :restrict_with_error
monetize :fee_cents
monetize :fee_old_cents
has_rich_text :body
has_rich_text :guardian_clause
has_rich_text :signature_legal_text
@@ -29,7 +29,7 @@ class ContractTemplate < ApplicationRecord
validates :name, presence: true
validates :release_type, presence: true
validates :fee_cents, numericality: {
validates :fee_old_cents, numericality: {
greater_than_or_equal_to: 0,
less_than_or_equal_to: 99_999_999_99
}
@@ -50,7 +50,11 @@ class ContractTemplate < ApplicationRecord
enum accessibility: [:public_template, :private_template]
def fee?
!fee.zero?
fee.present?
end
def fee_old?
!fee_old.zero?
end
def releases

View File

@@ -9,6 +9,10 @@ class VideoReleaseConfirmation < ApplicationRecord
Timecode.from_seconds(time_elapsed.to_f).to_s
end
def file
ActiveStorage::Attachment.find(file_id)
end
private
class ReleaseRankOrder