fixing conflit

Leandro Santos
2 parents ca21945c 131e0932
Showing 6 changed files with 35 additions and 943 deletions Show diff stats
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb.orig
app/models/person.rb
plugins/display_content/db/migrate/20140520100130_update_display_content_sections_array.rb
test/functional/profile_editor_controller_test.rb
 class Community < Organization
-  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
+  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type, :address_reference, :district, :tag_list, :language
   after_destroy :check_invite_member_for_destroy
   def self.type_name
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
+
   SEARCH_DISPLAYS += %w[map full]
   def self.type_name
@@ -1,938 +0,0 @@
-# A Environment is like a website to be hosted in the platform. It may
-# contain multiple Profile's and can be identified by several different
-# domains.
-class Environment < ActiveRecord::Base
-
-<<<<<<< HEAD
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :enabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body
-=======
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :disabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound
->>>>>>> rails3_AI3163-enable_disable_blocks
-
-  has_many :users
-
-  self.partial_updates = false
-
-  has_many :tasks, :dependent => :destroy, :as => 'target'
-
-  IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
-
-  def self.verify_filename(filename)
-    filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
-    filename
-  end
-
-  PERMISSIONS['Environment'] = {
-    'view_environment_admin_panel' => N_('View environment admin panel'),
-    'edit_environment_features' => N_('Edit environment features'),
-    'edit_environment_design' => N_('Edit environment design'),
-    'manage_environment_categories' => N_('Manage environment categories'),
-    'manage_environment_roles' => N_('Manage environment roles'),
-    'manage_environment_validators' => N_('Manage environment validators'),
-    'manage_environment_users' => N_('Manage environment users'),
-    'manage_environment_templates' => N_('Manage environment templates'),
-    'manage_environment_licenses' => N_('Manage environment licenses'),
-    'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
-    'edit_appearance'      => N_('Edit appearance'),
-  }
-
-  module Roles
-    def self.admin(env_id)
-      Role.find_by_key_and_environment_id('environment_administrator', env_id)
-    end
-  end
-
-  after_create :create_roles
-  def create_roles
-    Role.create!(
-      :key => 'environment_administrator',
-      :name => N_('Environment Administrator'),
-      :environment => self,
-      :permissions => PERMISSIONS[Environment.name].keys + PERMISSIONS[Profile.name].keys
-    )
-    Role.create!(
-      :key => 'profile_admin',
-      :name => N_('Profile Administrator'),
-      :environment => self,
-      :permissions => PERMISSIONS[Profile.name].keys
-    )
-    # members for enterprises, communities etc
-    Role.create!(
-      :key => "profile_member",
-      :name => N_('Member'),
-      :environment => self,
-      :permissions => [
-        'invite_members',
-      ]
-    )
-    # moderators for enterprises, communities etc
-    Role.create!(
-      :key => 'profile_moderator',
-      :name => N_('Moderator'),
-      :environment => self,
-      :permissions => [
-        'manage_memberships',
-        'edit_profile_design',
-        'manage_products',
-        'manage_friends',
-        'perform_task'
-      ]
-    )
-  end
-
-  def add_admin(user)
-    self.affiliate(user, Environment::Roles.admin(self.id))
-  end
-
-  def remove_admin(user)
-    self.disaffiliate(user, Environment::Roles.admin(self.id))
-  end
-
-  def admins
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id])
-  end
-
-  # returns the available features for a Environment, in the form of a
-  # hash, with pairs in the form <tt>'feature_name' => 'Feature name'</tt>.
-  def self.available_features
-    {
-      'disable_asset_articles' => _('Disable search for articles '),
-      'disable_asset_enterprises' => _('Disable search for enterprises'),
-      'disable_asset_people' => _('Disable search for people'),
-      'disable_asset_communities' => _('Disable search for communities'),
-      'disable_asset_products' => _('Disable search for products'),
-      'disable_asset_events' => _('Disable search for events'),
-      'disable_categories' => _('Disable categories'),
-      'disable_header_and_footer' => _('Disable header/footer editing by users'),
-      'disable_gender_icon' => _('Disable gender icon'),
-      'disable_categories_menu' => _('Disable the categories menu'),
-      'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
-      'disable_contact_person' => _('Disable contact for people'),
-      'disable_contact_community' => _('Disable contact for groups/communities'),
-
-      'products_for_enterprises' => _('Enable products for enterprises'),
-      'enterprise_registration' => _('Enterprise registration'),
-      'enterprise_activation' => _('Enable activation of enterprises'),
-      'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
-      'enterprises_are_validated_when_created' => _('Enterprises are validated when created'),
-
-      'media_panel' => _('Media panel in WYSIWYG editor'),
-      'select_preferred_domain' => _('Select preferred domains per profile'),
-      'use_portal_community' => _('Use the portal as news source for front page'),
-      'user_themes' => _('Allow users to create their own themes'),
-      'search_in_home' => _("Display search form in home page"),
-
-      'cant_change_homepage' => _("Don't allow users to change which article to use as homepage"),
-      'display_header_footer_explanation' => _("Display explanation about header and footer"),
-      'articles_dont_accept_comments_by_default' => _("Articles don't accept comments by default"),
-      'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
-      'enable_organization_url_change' => _("Allow organizations to change their URL"),
-      'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
-      'xmpp_chat' => _('XMPP/Jabber based chat'),
-      'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
-      'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
-      'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users'),
-      'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
-      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
-      'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
-      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
-    }
-  end
-
-  def self.login_redirection_options
-    {
-      'keep_on_same_page' => _('Stays on the same page the user was before login.'),
-      'site_homepage' => _('Redirects the user to the environment homepage.'),
-      'user_profile_page' => _('Redirects the user to his profile page.'),
-      'user_homepage' => _('Redirects the user to his homepage.'),
-      'user_control_panel' => _('Redirects the user to his control panel.')
-    }
-  end
-  validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
-
-  def self.signup_redirection_options
-    {
-      'keep_on_same_page' => _('Stays on the same page the user was before signup.'),
-      'site_homepage' => _('Redirects the user to the environment homepage.'),
-      'user_profile_page' => _('Redirects the user to his profile page.'),
-      'user_homepage' => _('Redirects the user to his homepage.'),
-      'user_control_panel' => _('Redirects the user to his control panel.')
-    }
-  end
-  validates_inclusion_of :redirection_after_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
-
-
-  # #################################################
-  # Relationships and applied behaviour
-  # #################################################
-
-  acts_as_having_boxes
-
-  after_create do |env|
-    3.times do
-      env.boxes << Box.new
-    end
-
-    # main area
-    env.boxes[0].blocks << MainBlock.new
-
-    # "left" area
-    env.boxes[1].blocks << LoginBlock.new
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    env.boxes[1].blocks << EnvironmentStatisticsBlock.new
-    env.boxes[1].blocks << RecentDocumentsBlock.new
-
-    # "right" area
-    env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
-    env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
-  end
-
-  # One Environment can be reached by many domains
-  has_many :domains, :as => :owner
-  has_many :profiles, :dependent => :destroy
-
-  has_many :organizations
-  has_many :enterprises
-  has_many :products, :through => :enterprises
-  has_many :people
-  has_many :communities
-  has_many :licenses
-
-  has_many :categories
-  has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
-
-  has_many :product_categories, :conditions => { :type => 'ProductCategory'}
-  has_many :regions
-  has_many :states
-  has_many :cities
-
-  has_many :roles, :dependent => :destroy
-
-  has_many :qualifiers
-  has_many :certifiers
-
-  has_many :mailings, :class_name => 'EnvironmentMailing', :foreign_key => :source_id, :as => 'source'
-
-  acts_as_accessible
-
-  has_many :units, :order => 'position'
-  has_many :production_costs, :as => :owner
-
-  def superior_intances
-    [self, nil]
-  end
-  # #################################################
-  # Attributes
-  # #################################################
-
-  # store the Environment settings as YAML-serialized Hash.
-  acts_as_having_settings :field => :settings
-
-  # the environment's terms of use: every user must accept them before registering.
-  settings_items :terms_of_use, :type => String
-
-  # the environment's terms of enterprise use: every enterprise member must accept them before
-  # registering or activating enterprises.
-  settings_items :terms_of_enterprise_use, :type => String
-
-  # returns the approval method used for this environment. Possible values are:
-  #
-  # Defaults to <tt>:admim</tt>.
-  settings_items :organization_approval_method, :type => Symbol, :default => :admin
-
-  # Whether this environment should force having 'www.' in its domain name or
-  # not. Defauls to false.
-  #
-  # Sets the value of #force_www. <tt>value</tt> must be a boolean.
-  #
-  # See also #default_hostname
-  settings_items :force_www, :default => false
-
-  settings_items :message_for_friend_invitation, :type => String
-  def message_for_friend_invitation
-    settings[:message_for_member_invitation] || InviteFriend.mail_template
-  end
-
-  settings_items :message_for_member_invitation, :type => String
-  def message_for_member_invitation
-    settings[:message_for_member_invitation] || InviteMember.mail_template
-  end
-
-  settings_items :min_signup_delay, :type => Integer, :default => 3 #seconds
-  settings_items :activation_blocked_text, :type => String
-  settings_items :message_for_disabled_enterprise, :type => String,
-                 :default => _('This enterprise needs to be enabled.')
-  settings_items :location, :type => String
-  settings_items :layout_template, :type => String, :default => 'default'
-  settings_items :homepage, :type => String
-  settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
-  settings_items :local_docs, :type => Array, :default => []
-  settings_items :news_amount_by_folder, :type => Integer, :default => 4
-  settings_items :help_message_to_add_enterprise, :type => String, :default => ''
-  settings_items :tip_message_enterprise_activation_question, :type => String, :default => ''
-
-  settings_items :currency_unit, :type => String, :default => '$'
-  settings_items :currency_separator, :type => String, :default => '.'
-  settings_items :currency_delimiter, :type => String, :default => ','
-
-  settings_items :trusted_sites_for_iframe, :type => Array, :default => %w[
-    developer.myspace.com
-    itheora.org
-    maps.google.com
-    platform.twitter.com
-    player.vimeo.com
-    stream.softwarelivre.org
-    tv.softwarelivre.org
-    www.facebook.com
-    www.flickr.com
-    www.gmodules.com
-    www.youtube.com
-  ] + ('a' .. 'z').map{|i| "#{i}.yimg.com"}
-
-  settings_items :enabled_plugins, :type => Array, :default => []
-
-  settings_items :disabled_blocks, :type => Array, :default => []
-
-  settings_items :search_hints, :type => Hash, :default => {}
-
-  # Set to return http forbidden to host not on the allow origin list bellow
-  settings_items :restrict_to_access_control_origins, :default => false
-  # Set this according to http://www.w3.org/TR/cors/. Headers are set at every response
-  # For multiple domains acts as suggested in http://stackoverflow.com/questions/1653308/access-control-allow-origin-multiple-origin-domains
-  settings_items :access_control_allow_origin, :type => Array, :default => []
-  settings_items :access_control_allow_methods, :type => String
-
-  settings_items :signup_welcome_screen_body, :type => String
-
-  def has_custom_welcome_screen?
-    settings[:signup_welcome_screen_body].present?
-  end
-
-  def news_amount_by_folder=(amount)
-    settings[:news_amount_by_folder] = amount.to_i
-  end
-
-  # Enables a feature identified by its name
-  def enable(feature, must_save=true)
-    self.settings["#{feature}_enabled".to_sym] = true
-    self.save! if must_save
-  end
-
-  def enable_plugin(plugin)
-    self.enabled_plugins += [plugin.to_s]
-    self.enabled_plugins.uniq!
-    self.save!
-  end
-
-  # Disables a feature identified by its name
-  def disable(feature, must_save=true)
-    self.settings["#{feature}_enabled".to_sym] = false
-    self.save! if must_save
-  end
-
-  def disable_plugin(plugin)
-    self.enabled_plugins.delete(plugin.to_s)
-    self.save!
-  end
-
-  # Tells if a feature, identified by its name, is enabled
-  def enabled?(feature)
-    self.settings["#{feature}_enabled".to_sym] == true
-  end
-  def disabled?(feature)
-    !self.enabled?(feature)
-  end
-
-  def plugin_enabled?(plugin)
-    enabled_plugins.include?(plugin.to_s)
-  end
-
-  def block_disabled?(block)
-    disabled_blocks.include?(block.to_s)
-  end
-
-  # enables the features identified by <tt>features</tt>, which is expected to
-  # be an Enumarable object containing the identifiers of the desired features.
-  # Passing <tt>nil</tt> is the same as passing an empty Array.
-  def enabled_features=(features)
-    features ||= []
-    self.class.available_features.keys.each do |feature|
-      if features.include? feature
-        self.enable(feature)
-      else
-        self.disable(feature)
-      end
-    end
-  end
-
-  def enabled_features
-    features = self.class.available_features
-    features.delete_if{ |k, v| !self.enabled?(k) }
-  end
-
-  DEFAULT_FEATURES = %w(
-    disable_asset_products
-    disable_gender_icon
-    products_for_enterprises
-    disable_select_city_for_contact
-    enterprise_registration
-    media_panel
-    organizations_are_moderated_by_default
-    show_balloon_with_profile_links_when_clicked
-    show_zoom_button_on_article_images
-    use_portal_community
-  )
-
-  before_create :enable_default_features
-  def enable_default_features
-    DEFAULT_FEATURES.each do |feature|
-      enable(feature, false)
-    end
-  end
-
-  # returns <tt>true</tt> if this Environment has terms of use to be
-  # accepted by users before registration.
-  def has_terms_of_use?
-    ! self.terms_of_use.blank?
-  end
-
-  # returns <tt>true</tt> if this Environment has terms of enterprise use to be
-  # accepted by users before registration or activation of enterprises.
-  def has_terms_of_enterprise_use?
-    ! self.terms_of_enterprise_use.blank?
-  end
-
-  # Sets the organization_approval_method. Only accepts the following values:
-  #
-  # * <tt>:admin</tt>: organization registration must be approved by the
-  #   environment administrator.
-  # * <tt>:region</tt>: organization registering must be approved by some other
-  #   organization asssigned as validator to the Region the new organization
-  #   belongs to.
-  # * <tt>:none</tt>: organization registration is approved by default.
-  #
-  # Trying to set organization_approval_method to any other value will raise an
-  # ArgumentError.
-  #
-  # The value passed as argument is converted to a Symbol before being actually
-  # set to this setting.
-  def organization_approval_method=(value)
-    actual_value = value.to_sym
-
-    accepted_values = %w[
-      admin
-      region
-      none
-    ].map(&:to_sym)
-    raise ArgumentError unless accepted_values.include?(actual_value)
-
-    self.settings[:organization_approval_method] = actual_value
-  end
-
-  def custom_person_fields
-    self.settings[:custom_person_fields].nil? ? {} : self.settings[:custom_person_fields]
-  end
-
-  def custom_person_fields=(values)
-    if values['schooling'] && values['schooling']['active'] == 'true'
-      schooling_status = values['schooling']
-    end
-
-    self.settings[:custom_person_fields] = values.delete_if { |key, value| ! Person.fields.include?(key)}
-    self.settings[:custom_person_fields].each_pair do |key, value|
-      if value['required'] == 'true'
-        self.settings[:custom_person_fields][key]['active'] = 'true'
-        self.settings[:custom_person_fields][key]['signup'] = 'true'
-      end
-      if value['signup'] == 'true'
-        self.settings[:custom_person_fields][key]['active'] = 'true'
-      end
-    end
-
-    if schooling_status
-      self.settings[:custom_person_fields]['schooling_status'] = schooling_status
-    end
-  end
-
-  def custom_person_field(field, status)
-    if (custom_person_fields[field] && custom_person_fields[field][status] == 'true')
-      return true
-    end
-    false
-  end
-
-  def active_person_fields
-    (custom_person_fields.delete_if { |key, value| !custom_person_field(key, 'active')}).keys || []
-  end
-
-  def required_person_fields
-    required_fields = []
-    active_person_fields.each do |field|
-      required_fields << field if custom_person_fields[field]['required'] == 'true'
-    end
-    required_fields
-  end
-
-  def signup_person_fields
-    signup_fields = []
-    active_person_fields.each do |field|
-      signup_fields << field if custom_person_fields[field]['signup'] == 'true'
-    end
-    signup_fields
-  end
-
-  def invitation_mail_template(profile)
-    if profile.person?
-      message_for_friend_invitation
-    else
-      message_for_member_invitation
-    end
-  end
-
-  def custom_enterprise_fields
-    self.settings[:custom_enterprise_fields].nil? ? {} : self.settings[:custom_enterprise_fields]
-  end
-
-  def custom_enterprise_fields=(values)
-    self.settings[:custom_enterprise_fields] = values.delete_if { |key, value| ! Enterprise.fields.include?(key)}
-    self.settings[:custom_enterprise_fields].each_pair do |key, value|
-      if value['required'] == 'true'
-        self.settings[:custom_enterprise_fields][key]['active'] = 'true'
-        self.settings[:custom_enterprise_fields][key]['signup'] = 'true'
-      end
-      if value['signup'] == 'true'
-        self.settings[:custom_enterprise_fields][key]['active'] = 'true'
-      end
-    end
-  end
-
-  def custom_enterprise_field(field, status)
-    if (custom_enterprise_fields[field] && custom_enterprise_fields[field][status] == 'true')
-      return true
-    end
-    false
-  end
-
-  def active_enterprise_fields
-     (custom_enterprise_fields.delete_if { |key, value| !custom_enterprise_field(key, 'active')}).keys || []
-  end
-
-  def required_enterprise_fields
-    required_fields = []
-    active_enterprise_fields.each do |field|
-      required_fields << field if custom_enterprise_fields[field]['required'] == 'true'
-    end
-    required_fields
-  end
-
-  def signup_enterprise_fields
-    signup_fields = []
-    active_enterprise_fields.each do |field|
-      signup_fields << field if custom_enterprise_fields[field]['signup'] == 'true'
-    end
-    signup_fields
-  end
-
-  def custom_community_fields
-    self.settings[:custom_community_fields].nil? ? {} : self.settings[:custom_community_fields]
-  end
-  def custom_community_fields=(values)
-    self.settings[:custom_community_fields] = values.delete_if { |key, value| ! Community.fields.include?(key) }
-    self.settings[:custom_community_fields].each_pair do |key, value|
-      if value['required'] == 'true'
-        self.settings[:custom_community_fields][key]['active'] = 'true'
-        self.settings[:custom_community_fields][key]['signup'] = 'true'
-      end
-      if value['signup'] == 'true'
-        self.settings[:custom_community_fields][key]['active'] = 'true'
-      end
-    end
-  end
-
-  def custom_community_field(field, status)
-    if (custom_community_fields[field] && custom_community_fields[field][status] == 'true')
-      return true
-    end
-    false
-  end
-
-  def active_community_fields
-    (custom_community_fields.delete_if { |key, value| !custom_community_field(key, 'active')}).keys
-  end
-
-  def required_community_fields
-    required_fields = []
-    active_community_fields.each do |field|
-      required_fields << field if custom_community_fields[field]['required'] == 'true'
-    end
-    required_fields
-  end
-
-  def signup_community_fields
-    signup_fields = []
-    active_community_fields.each do |field|
-      signup_fields << field if custom_community_fields[field]['signup'] == 'true'
-    end
-    signup_fields
-  end
-
-  serialize :signup_welcome_text, Hash
-  def signup_welcome_text
-    self[:signup_welcome_text] ||= {}
-  end
-
-  def signup_welcome_text_subject
-    self.signup_welcome_text[:subject]
-  end
-
-  def signup_welcome_text_subject=(subject)
-    self.signup_welcome_text[:subject] = subject
-  end
-
-  def signup_welcome_text_body
-    self.signup_welcome_text[:body]
-  end
-
-  def signup_welcome_text_body=(body)
-    self.signup_welcome_text[:body] = body
-  end
-
-  def has_signup_welcome_text?
-    signup_welcome_text && !signup_welcome_text_body.blank?
-  end
-
-  # #################################################
-  # Validations
-  # #################################################
-
-  # <tt>name</tt> is mandatory
-  validates_presence_of :name
-
-  # only one environment can be the default one
-  validates_uniqueness_of :is_default, :if => (lambda do |environment| environment.is_default? end), :message => N_('Only one Virtual Community can be the default one')
-
-  validates_format_of :contact_email, :noreply_email, :with => Noosfero::Constants::EMAIL_FORMAT, :allow_blank => true
-
-  xss_terminate :only => [ :message_for_disabled_enterprise ], :with => 'white_list', :on => 'validation'
-
-  validates_presence_of :theme
-  validates_numericality_of :reports_lower_bound, :allow_nil => false, :only_integer => true, :greater_than_or_equal_to => 0
-
-  include WhiteListFilter
-  filter_iframes :message_for_disabled_enterprise
-  def iframe_whitelist
-    trusted_sites_for_iframe
-  end
-
-  # #################################################
-  # Business logic in general
-  # #################################################
-
-  # the default Environment.
-  def self.default
-    self.find(:first, :conditions => [ 'is_default = ?', true ] )
-  end
-
-  # returns an array with the top level categories for this environment.
-  def top_level_categories
-    Category.top_level_for(self)
-  end
-
-  # Returns the hostname of the first domain associated to this environment.
-  #
-  # If #force_www is true, adds 'www.' at the beginning of the hostname. If the
-  # environment has not associated domains, returns 'localhost'.
-  def default_hostname(email_hostname = false)
-    domain = 'localhost'
-    unless self.domains(true).empty?
-      domain = (self.domains.find_by_is_default(true) || self.domains.find(:first, :order => 'id')).name
-      domain = email_hostname ? domain : (force_www ? ('www.' + domain) : domain)
-    end
-    domain
-  end
-
-  def admin_url
-    { :controller => 'admin_panel', :action => 'index' }
-  end
-
-  def top_url
-    url = 'http://'
-    url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
-    url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
-    url
-  end
-
-  def to_s
-    self.name || '?'
-  end
-
-  has_many :articles, :through => :profiles
-  def recent_documents(limit = 10, options = {}, pagination = true)
-    self.articles.recent(limit, options, pagination)
-  end
-
-  has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
-
-  has_many :tags, :through => :articles
-
-  def tag_counts
-    articles.tag_counts.inject({}) do |memo,tag|
-      memo[tag.name] = tag.count
-      memo
-    end
-  end
-
-  def themes
-    if settings[:themes]
-      Theme.system_themes.select { |theme| settings[:themes].include?(theme.id) }
-    else
-      []
-    end
-  end
-
-  def themes=(values)
-    settings[:themes] = values
-  end
-
-  def add_themes(values)
-    if settings[:themes].nil?
-      self.themes = values
-    else
-      settings[:themes] += values
-    end
-  end
-
-  def update_theme(theme)
-    self.theme = theme
-    self.save!
-  end
-
-  def update_layout_template(template)
-    self.layout_template = template
-    self.save!
-  end
-
-  before_create do |env|
-    env.settings[:themes] ||= %w[
-      aluminium
-      butter
-      chameleon
-      chocolate
-      noosfero
-      orange
-      plum
-      scarletred
-      skyblue
-    ]
-  end
-
-  def community_template
-    template = Community.find_by_id settings[:community_template_id]
-    template if template && template.is_template
-  end
-
-  def community_template=(value)
-    settings[:community_template_id] = value.id
-  end
-
-  def person_template
-    template = Person.find_by_id settings[:person_template_id]
-    template if template && template.is_template
-  end
-
-  def person_template=(value)
-    settings[:person_template_id] = value.id
-  end
-
-  def enterprise_template
-    template = Enterprise.find_by_id settings[:enterprise_template_id]
-    template if template && template.is_template
-  end
-
-  def enterprise_template=(value)
-    settings[:enterprise_template_id] = value.id
-  end
-
-  def inactive_enterprise_template
-    template = Enterprise.find_by_id settings[:inactive_enterprise_template_id]
-    template if template && template.is_template
-  end
-
-  def inactive_enterprise_template=(value)
-    settings[:inactive_enterprise_template_id] = value.id
-  end
-
-  def replace_enterprise_template_when_enable
-    settings[:replace_enterprise_template_when_enable] || false
-  end
-
-  def replace_enterprise_template_when_enable=(value)
-    settings[:replace_enterprise_template_when_enable] = value
-  end
-
-  def portal_community
-    Community[settings[:portal_community_identifier]]
-  end
-
-  def portal_community=(value)
-    settings[:portal_community_identifier] = value.nil? ? nil : value.identifier
-  end
-
-  def unset_portal_community!
-    self.portal_community=nil
-    self.portal_folders=nil
-    self.news_amount_by_folder=nil
-    self.disable('use_portal_community')
-    self.save
-  end
-
-  def is_portal_community?(profile)
-    portal_community == profile
-  end
-
-  def portal_folders
-    (settings[:portal_folders] || []).map{|fid| portal_community.articles.find(:first, :conditions => { :id => fid }) }.compact
-  end
-
-  def portal_folders=(folders)
-    settings[:portal_folders] = folders ? folders.map(&:id) : nil
-  end
-
-  def portal_news_cache_key(language='en')
-    "home-page-news/#{cache_key}-#{language}"
-  end
-
-  def notification_emails
-    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
-  end
-
-  after_create :create_templates
-
-  def create_templates
-    prefix = self.name.to_slug + '_'
-
-    enterprise_template = Enterprise.new(
-      :name => 'Enterprise template',
-      :identifier => prefix + 'enterprise_template'
-    )
-
-    inactive_enterprise_template = Enterprise.new(
-      :name => 'Inactive Enterprise template',
-      :identifier => prefix + 'inactive_enterprise_template'
-    )
-
-    community_template = Community.new(
-      :name => 'Community template',
-      :identifier => prefix + 'community_template'
-    )
-
-    [
-      enterprise_template,
-      inactive_enterprise_template,
-      community_template
-    ].each do |profile|
-      profile.is_template = true
-      profile.visible = false
-      profile.environment = self
-      profile.save!
-    end
-
-    pass = Digest::MD5.hexdigest rand.to_s
-    user = User.new(:login => (prefix + 'person_template'), :email => (prefix + 'template@template.noo'), :password => pass, :password_confirmation => pass)
-    user.environment = self
-    user.save!
-
-    person_template = user.person
-    person_template.name = "Person template"
-    person_template.is_template = true
-    person_template.visible = false
-    person_template.save!
-
-    self.enterprise_template = enterprise_template
-    self.inactive_enterprise_template = inactive_enterprise_template
-    self.community_template = community_template
-    self.person_template = person_template
-    self.save!
-  end
-
-  after_create :create_default_licenses
-  def create_default_licenses
-    [
-      { :name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode'},
-      { :name => 'CC (by-nd)', :url => 'http://creativecommons.org/licenses/by-nd/3.0/legalcode'},
-      { :name => 'CC (by-sa)', :url => 'http://creativecommons.org/licenses/by-sa/3.0/legalcode'},
-      { :name => 'CC (by-nc)', :url => 'http://creativecommons.org/licenses/by-nc/3.0/legalcode'},
-      { :name => 'CC (by-nc-nd)', :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/legalcode'},
-      { :name => 'CC (by-nc-sa)', :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode'},
-      { :name => 'Free Art', :url => 'http://artlibre.org/licence/lal/en'},
-      { :name => 'GNU FDL', :url => 'http://www.gnu.org/licenses/fdl-1.3.txt'},
-    ].each do |data|
-      license = License.new(data)
-      license.environment = self
-      license.save!
-    end
-  end
-
-  def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true, :profile_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
-  end
-
-  settings_items :home_cache_in_minutes, :type => :integer, :default => 5
-  settings_items :general_cache_in_minutes, :type => :integer, :default => 15
-  settings_items :profile_cache_in_minutes, :type => :integer, :default => 15
-
-  def image_galleries
-    portal_community ? portal_community.image_galleries : []
-  end
-
-  serialize :languages
-
-  before_validation do |environment|
-    environment.default_language = nil if environment.default_language.blank?
-  end
-
-  validate :default_language_available
-  validate :languages_available
-
-  def locales
-    if languages.present?
-      languages.inject({}) {|r, l| r.merge({l => Noosfero.locales[l]})}
-    else
-      Noosfero.locales
-    end
-  end
-
-  def default_locale
-    default_language || Noosfero.default_locale
-  end
-
-  def available_locales
-    locales_list = locales.keys
-    # move English to the beginning
-    if locales_list.include?('en')
-      locales_list = ['en'] + (locales_list - ['en']).sort
-    end
-    locales_list
-  end
-
-  private
-
-  def default_language_available
-    if default_language.present? && !available_locales.include?(default_language)
-      errors.add(:default_language, _('is not available.'))
-    end
-  end
-
-  def languages_available
-    if languages.present?
-      languages.each do |language|
-        if !Noosfero.available_locales.include?(language)
-          errors.add(:languages, _('have unsupported languages.'))
-          break
-        end
-      end
-    end
-  end
-end
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
-  attr_accessible :organization, :contact_information, :sex, :birth_date, :professional_activity
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website
   SEARCH_FILTERS += %w[
     more_popular
+# encoding: UTF-8
 class UpdateDisplayContentSectionsArray < ActiveRecord::Migration
   def self.up
@@ -6,7 +6,7 @@ class ProfileEditorController; def rescue_action(e) raise e end; end
 class ProfileEditorControllerTest < ActionController::TestCase
   all_fixtures
-  
+
   def setup
     @controller = ProfileEditorController.new
     @request    = ActionController::TestRequest.new
@@ -46,7 +46,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   end
   should 'saving profile info' do
-    person = profile 
+    person = profile
     post :edit, :profile => profile.identifier, :profile_data => { 'name' => 'new person', 'contact_information' => 'new contact information', 'address' => 'new address', 'sex' => 'female' }
     assert_redirected_to :controller => 'profile_editor', :action => 'index'
     person = Person.find(person.id)
@@ -56,6 +56,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_equal 'female', person.sex
   end
+  should 'mass assign all environment configurable person fields' do
+    person = profile
+
+    post :edit, :profile => profile.identifier, :profile_data => { "nickname" => "ze", "description" => "Just a regular ze.", "contact_information" => "What?", "contact_phone" => "+0551133445566", "cell_phone" => "+0551188889999", "comercial_phone" => "+0551144336655", "jabber_id" => "ze1234", "personal_website" => "http://ze.com.br", "sex" => "male", "birth_date" => "2014-06-04", "nationality" => "Brazilian", "country" => "BR", "state" => "DF", "city" => "Brasilia", "zip_code" => "70300-010", "address" => "Palacio do Planalto", "address_reference" => "Praca dos tres poderes", "district" => "DF", "schooling" => "Undergraduate", "schooling_status" => "Concluded", "formation" => "Engineerings", "area_of_study" => "Metallurgy", "professional_activity" => "Metallurgic", "organization" => "Metal Corp.", "organization_website" => "http://metal.com" }
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'profile_editor', :action => 'index'
+  end
+
   should 'not permmit if not logged' do
     logout
     get :index, :profile => profile.identifier
@@ -160,6 +169,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_person]', :value => 'my contact' }
   end
+  should 'mass assign all environment configurable community fields' do
+    cmm = fast_create(Community)
+
+    post :edit, :profile => cmm.identifier, :profile_data => { "name" => "new name", "display_name" => "N&w N@me", "description"=>"We sell food and other stuff.", "contact_person"=>"Joseph of the Jungle", "contact_email"=>"sac@company.net", "contact_phone"=>"+0551133445566", "legal_form"=>"New Name corp.", "economic_activity"=>"Food", "management_information"=>"No need for that here.", "address"=>"123, baufas street", "address_reference"=>"Next to baufas house", "district"=>"DC", "zip_code"=>"123456", "city"=>"Whashington", "state"=>"DC", "country"=>"US", "tag_list"=>"food, corporations", "language"=>"English" }
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'profile_editor', :action => 'index'
+  end
+
   should 'show field values on edit enterprise info' do
     Enterprise.any_instance.expects(:active_fields).returns(['contact_person']).at_least_once
     org = fast_create(Enterprise)
@@ -169,6 +187,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_person]', :value => 'my contact' }
   end
+  should 'mass assign all environment configurable enterprise fields' do
+    enterprise = fast_create(Enterprise)
+
+    post :edit, :profile => enterprise.identifier, :profile_data => { "name"=>"Enterprise", "display_name"=>"Enterprise name", "business_name"=>"Enterprise", "description"=>"Hello IT.", "contact_person"=>"Joseph", "contact_email"=>"joe@enterprise.net", "contact_phone"=>"+0551133445566", "legal_form"=>"Enterprise corp.", "economic_activity"=>"Food", "management_information"=>"None.", "address"=>"123, baufas street", "address_reference"=>"Next to baufas house", "district"=>"DC", "zip_code"=>"123456", "city"=>"Washington", "state"=>"DC", "country"=>"US", "tag_list"=>"food, corporations", "organization_website"=>"http://enterprise.net", "historic_and_current_context"=>"Historic.", "activities_short_description"=>"Activies.", "acronym"=>"E", "foundation_year"=>"1995",}
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'profile_editor', :action => 'index'
+  end
+
   should 'display profile publication option in edit profile screen' do
     get :edit, :profile => profile.identifier
     assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'true' }
@@ -422,7 +449,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     get :index, :profile => ent.identifier
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{ent.identifier}/profile_editor/enable" }
   end
-  
+
   should 'link to disable enterprise' do
     ent = fast_create(Enterprise, :enabled => true)
     get :index, :profile => ent.identifier
1	class Community < Organization	1	class Community < Organization
2		2
3	- attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type	3	+ attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type, :address_reference, :district, :tag_list, :language
4	after_destroy :check_invite_member_for_destroy	4	after_destroy :check_invite_member_for_destroy
5		5
6	def self.type_name	6	def self.type_name
	@@ -2,6 +2,8 @@		@@ -2,6 +2,8 @@
2	# only enterprises can offer products and services.	2	# only enterprises can offer products and services.
3	class Enterprise < Organization	3	class Enterprise < Organization
4		4
		5	+ attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
		6	+
5	SEARCH_DISPLAYS += %w[map full]	7	SEARCH_DISPLAYS += %w[map full]
6		8
7	def self.type_name	9	def self.type_name
1	# A person is the profile of an user holding all relationships with the rest of the system	1	# A person is the profile of an user holding all relationships with the rest of the system
2	class Person < Profile	2	class Person < Profile
3		3
4	- attr_accessible :organization, :contact_information, :sex, :birth_date, :professional_activity	4	+ attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website
5		5
6	SEARCH_FILTERS += %w[	6	SEARCH_FILTERS += %w[
7	more_popular	7	more_popular
		1	+# encoding: UTF-8
1	class UpdateDisplayContentSectionsArray < ActiveRecord::Migration	2	class UpdateDisplayContentSectionsArray < ActiveRecord::Migration
2		3
3	def self.up	4	def self.up