Download as
Browse Code »

Commit 15c2ef25aa2002cc5d4054ed9c8327e44f4822df

Authored by Victor Costa
1 parent f61d6f06
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: move zip_code, city, state and country settings to organization

Showing 3 changed files with 3 additions and 2 deletions   Show diff stats
app/models/community.rb
  Diff comments   View file @15c2ef2
@@ -9,7 +9,6 @@ class Community < Organization @@ -9,7 +9,6 @@ class Community < Organization
9 N_('Language') 9 N_('Language')
10 10
11 settings_items :language 11 settings_items :language
12 - settings_items :zip_code, :city, :state, :country  
13 12
14 extend SetProfileRegionFromCityState::ClassMethods 13 extend SetProfileRegionFromCityState::ClassMethods
15 set_profile_region_from_city_state 14 set_profile_region_from_city_state
app/models/enterprise.rb
  Diff comments   View file @15c2ef2
@@ -22,7 +22,7 @@ class Enterprise < Organization @@ -22,7 +22,7 @@ class Enterprise < Organization
22 22
23 N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code') 23 N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
24 24
25 - settings_items :organization_website, :historic_and_current_context, :activities_short_description, :zip_code, :city, :state, :country 25 + settings_items :organization_website, :historic_and_current_context, :activities_short_description
26 26
27 extend SetProfileRegionFromCityState::ClassMethods 27 extend SetProfileRegionFromCityState::ClassMethods
28 set_profile_region_from_city_state 28 set_profile_region_from_city_state
app/models/organization.rb
  Diff comments   View file @15c2ef2
@@ -108,6 +108,8 @@ class Organization < Profile @@ -108,6 +108,8 @@ class Organization < Profile
108 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') 108 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')
109 settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference 109 settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
110 110
  111 + settings_items :zip_code, :city, :state, :country
  112 +
111 validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT 113 validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
112 validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? }) 114 validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
113 validates_as_cnpj :cnpj 115 validates_as_cnpj :cnpj