From 15c2ef25aa2002cc5d4054ed9c8327e44f4822df Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 31 Jan 2014 10:57:11 -0300 Subject: [PATCH] rails3: move zip_code, city, state and country settings to organization --- app/models/community.rb | 1 - app/models/enterprise.rb | 2 +- app/models/organization.rb | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/community.rb b/app/models/community.rb index 42507f6..35d9701 100644 --- a/app/models/community.rb +++ b/app/models/community.rb @@ -9,7 +9,6 @@ class Community < Organization N_('Language') settings_items :language - settings_items :zip_code, :city, :state, :country extend SetProfileRegionFromCityState::ClassMethods set_profile_region_from_city_state diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index ba4232e..f3f773e 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -22,7 +22,7 @@ class Enterprise < Organization N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code') - settings_items :organization_website, :historic_and_current_context, :activities_short_description, :zip_code, :city, :state, :country + settings_items :organization_website, :historic_and_current_context, :activities_short_description extend SetProfileRegionFromCityState::ClassMethods set_profile_region_from_city_state diff --git a/app/models/organization.rb b/app/models/organization.rb index a212c6a..02af49c 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -108,6 +108,8 @@ class Organization < Profile N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference') settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference + settings_items :zip_code, :city, :state, :country + validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? }) validates_as_cnpj :cnpj -- libgit2 0.21.2