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

make editing non-native release possible

Browse Source
This commit is contained in:
bilal
2020-06-15 19:23:48 +02:00
parent dde1e975e2
commit 9c0d9b9919
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/appearance_release.rb
View File

@@ -19,7 +19,7 @@ class AppearanceRelease < ApplicationRecord
composed_of :person_address, composed_of :person_address,
class_name: 'Address', class_name: 'Address',
mapping: [ mapping: [
%w[person_address_street1 street1], %w[person_address_street1 street1],
%w[person_address_street2 street2], %w[person_address_street2 street2],
%w[person_address_city city], %w[person_address_city city],
%w[person_address_state state], %w[person_address_state state],
@@ -82,7 +82,19 @@ class AppearanceRelease < ApplicationRecord
scope :having_no_person_photo, -> { left_joins(:person_photo_attachment).group(:id).having('COUNT(active_storage_attachments) = 0') } scope :having_no_person_photo, -> { left_joins(:person_photo_attachment).group(:id).having('COUNT(active_storage_attachments) = 0') }
scope :with_person_name, ->(name) { where('person_first_name ILIKE ? OR person_last_name ILIKE ?', "%#{name}%") } scope :with_person_name, ->(name) { where('person_first_name ILIKE ? OR person_last_name ILIKE ?', "%#{name}%") }
searchable_on %i[person_first_name person_last_name person_address person_email person_phone] searchable_on %i[
person_first_name
person_last_name
person_address_old
person_address_street1
person_address_street2
person_address_city
person_address_state
person_address_zip
person_address_country
person_email
person_phone
]
def person_address def person_address
return self.person_address_old if self.person_address_old.present? return self.person_address_old if self.person_address_old.present?

8
app/models/sample_appearance_release.rb
View File

@@ -8,7 +8,13 @@ class SampleAppearanceRelease < AppearanceRelease
def default_attrs def default_attrs
{ {
person_address: "Street Address, City, State Zipcode", person_address_old: "Street Address, City, State Zipcode",
person_address_street1: "St1",
person_address_street2: "St2",
person_address_city: "City",
person_address_state: "State",
person_address_zip: "ZIP",
person_address_country: "Country",
person_first_name: "Some", person_first_name: "Some",
person_last_name: "Person", person_last_name: "Person",
person_phone: "555-555-5555", person_phone: "555-555-5555",

1
config/locales/en.yml
View File

@@ -329,6 +329,7 @@ en:
person_title: Title person_title: Title
appearance_release: appearance_release:
minor: Is the person a minor? minor: Is the person a minor?
person_address_old: Address
person_address: Address person_address: Address
person_address_city: City person_address_city: City
person_address_country: Country person_address_country: Country

1
config/locales/es.yml
View File

@@ -125,6 +125,7 @@ es:
person_address_street2: Address (Line 2) (ES) person_address_street2: Address (Line 2) (ES)
minor: El firmante es un menor minor: El firmante es un menor
person_address: Dirección person_address: Dirección
person_address_old: Dirección
person_email: Dirección de correo electrónico person_email: Dirección de correo electrónico
person_name: Nómbre person_name: Nómbre
person_phone: Número de teléfono person_phone: Número de teléfono