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

use person_address_street1 for old person_address

Browse Source
This commit is contained in:
bilal
2020-06-17 09:31:38 +02:00
parent e981ee28ee
commit fe4649ca64
10 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/appearance_releases_controller.rb
View File

@@ -79,7 +79,7 @@ class AppearanceReleasesController < ApplicationController
def appearance_release_params
params.require(:appearance_release).permit(:contract, :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
:person_address_old, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
:person_address_street1, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
:applicable_medium_id, :applicable_medium_text,
:territory_id, :territory_text,
:term_id, :term_text, :person_date_of_birth,

24
app/models/appearance_release.rb
View File

@@ -20,11 +20,11 @@ class AppearanceRelease < ApplicationRecord
class_name: 'Address',
mapping: [
%w[person_address_street1 street1],
%w[person_address_street2 street2],
%w[person_address_city city],
%w[person_address_state state],
%w[person_address_zip zip],
%w[person_address_country country]
%w[person_address_street2 street2],
%w[person_address_city city],
%w[person_address_state state],
%w[person_address_zip zip],
%w[person_address_country country]
]
# These validations apply to all releases
@@ -85,7 +85,6 @@ class AppearanceRelease < ApplicationRecord
searchable_on %i[
person_first_name
person_last_name
person_address_old
person_address_street1
person_address_street2
person_address_city
@@ -96,19 +95,6 @@ class AppearanceRelease < ApplicationRecord
person_phone
]
def person_address
return self.person_address_old if self.person_address_old.present?
Address.new(
self.person_address_street1,
self.person_address_street2,
self.person_address_city,
self.person_address_state,
self.person_address_zip,
self.person_address_country
).to_s(format: :full)
end
# All releases must respond to the following messages
def name
person_name

3
app/models/sample_appearance_release.rb
View File

@@ -8,8 +8,7 @@ class SampleAppearanceRelease < AppearanceRelease
def default_attrs
{
person_address_old: "Street Address, City, State Zipcode",
person_address_street1: "St1",
person_address_street1: "Street Address, City, State Zipcode",
person_address_street2: "St2",
person_address_city: "City",
person_address_state: "State",

2
app/views/appearance_releases/_form.html.erb
View File

@@ -13,7 +13,7 @@
<div class="form-row">
<%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
<%= form.date_field :person_date_of_birth, wrapper_class: "col-sm-6", placeholder: Date.current %>
<%= form.text_field :person_address_old, wrapper_class: "col-sm-6" %>
<%= form.text_field :person_address_street1, wrapper_class: "col-sm-6" %>
</div>
<div class="<%= class_string("collapse" => !appearance_release.minor?) %>" data-ujs-target="guardian-fields">