Convert Location urls field to singular website.

app/models/concerns/search.rb

@@ -32,9 +32,9 @@ module Search
         Location.where(locations[:admin_emails].matches("%#{email}%").
                 or(locations[:emails].matches("%#{email}%")))
       else
-        # where('urls ilike :q or emails ilike :q or admin_emails @@ :p', q: "%#{domain}%", p: email)
+        # where('website ilike :q or emails ilike :q or admin_emails @@ :p', q: "%#{domain}%", p: email)
         Location.where(locations[:admin_emails].matches("%#{email}%").
-                or(locations[:urls].matches("%#{domain}%")).
+                or(locations[:website].matches("%#{domain}%")).
                 or(locations[:emails].matches("%#{domain}%")))
       end
     end)

app/models/location.rb

@@ -1,7 +1,7 @@
 class Location < ActiveRecord::Base
   attr_accessible :accessibility, :active, :admin_emails, :alternate_name,
                   :description, :emails, :languages, :latitude,
-                  :longitude, :name, :short_desc, :transportation, :urls,
+                  :longitude, :name, :short_desc, :transportation, :website,
                   :virtual, :address_attributes, :contacts_attributes,
                   :mail_address_attributes, :phones_attributes,
                   :services_attributes, :regular_schedules_attributes,
@@ -58,11 +58,7 @@ class Location < ActiveRecord::Base
   ## displayed in the ohana-web-search client to suit your needs.
   # validates :short_desc, length: { maximum: 200 }
 
-  # Custom validation for values within arrays.
-  # For example, the urls field is an array that can contain multiple URLs.
-  # To be able to validate each URL in the array, we have to use a
-  # custom array validator. See app/validators/array_validator.rb
-  validates :urls, array: { url: true }
+  validates :website, url: true
 
   validates :languages, pg_array: true
 
@@ -88,12 +84,10 @@ class Location < ActiveRecord::Base
 
   serialize :emails, Array
 
-  serialize :urls, Array
+  auto_strip_attributes :description, :name, :short_desc, :transportation,
+                        :website
 
-  auto_strip_attributes :description, :name, :short_desc,
-                        :transportation
-
-  auto_strip_attributes :admin_emails, :emails, :urls,
+  auto_strip_attributes :admin_emails, :emails,
                         reject_blank: true, nullify: false
 
   extend FriendlyId

app/serializers/location_serializer.rb

@@ -2,7 +2,7 @@ class LocationSerializer < ActiveModel::Serializer
   attributes :id, :active, :accessibility, :admin_emails, :alternate_name,
              :coordinates, :description, :emails, :languages,
              :latitude, :longitude, :name, :short_desc, :slug, :transportation,
-             :updated_at, :urls, :url
+             :website, :updated_at, :url
 
   has_one :address
   has_many :contacts

app/serializers/locations_serializer.rb

@@ -1,7 +1,7 @@
 class LocationsSerializer < ActiveModel::Serializer
   attributes :id, :active, :admin_emails, :alternate_name, :coordinates,
              :description, :latitude, :longitude, :name, :short_desc, :slug,
-             :updated_at, :urls, :contacts_url, :services_url, :url
+             :website, :updated_at, :contacts_url, :services_url, :url
 
   has_one :address
   has_one :organization, serializer: LocationsOrganizationSerializer

app/views/admin/locations/forms/_fields.html.haml

@@ -22,5 +22,5 @@
 = render 'admin/shared/forms/hours', f: f
 = render 'admin/shared/forms/holiday_hours', f: f
 = render 'admin/locations/forms/transportation', f: f
-= render 'admin/locations/forms/urls', f: f
+= render 'admin/shared/forms/website', f: f
 = render 'admin/locations/forms/accessibility', f: f

app/views/admin/organizations/forms/_fields.html.haml

@@ -16,5 +16,5 @@
 = render 'admin/organizations/forms/licenses', f: f
 = render 'admin/organizations/forms/tax_id', f: f
 = render 'admin/organizations/forms/tax_status', f: f
-= render 'admin/organizations/forms/website', f: f
+= render 'admin/shared/forms/website', f: f
 = render 'admin/locations/forms/phones', f: f

app/views/admin/services/forms/_fields.html.haml

@@ -23,7 +23,7 @@
 = render 'admin/services/forms/required_documents', f: f
 = render 'admin/services/forms/service_areas', f: f
 = render 'admin/services/forms/status', f: f
-= render 'admin/services/forms/website', f: f
+= render 'admin/shared/forms/website', f: f
 = render 'admin/services/forms/wait', f: f
 = render 'admin/services/forms/categories', f: f
 = render 'admin/services/forms/keywords', f: f

app/views/admin/organizations/forms/_website.html.haml → app/views/admin/shared/forms/_website.html.haml

@@ -1,6 +1,6 @@
 .inst-box
   %header
-    = f.label :website, 'Organization Website'
+    = f.label :website, "#{f.object.class} Website"
   = field_set_tag do
     .row
       .col-sm-6