ActionItem833: port unifreire-specific changes as configuration into master branch

* making fields appear on signup form * environment has a list of Category subclasses that must be available for users; if there is only one category type available, no need of asking for category type * environment has a setting categories_menu which enables/disables the category menu. If it is disabled, then no need to ask for a color in the menu * add a configuration to the environment called disable_gender_icon. When it is false, don't display gender icons. * adding css for profile_data * adding required on label for schooling fixing javascript * adding fields on signup and option to admin manage * adding required message on required fields * adding partials for person/enterprise/community fields * adding methods for person/community/enterprise custom_fields * adding option to admin manage person fields

ActionItem833: port unifreire-specific changes as configuration into master branch
* making fields appear on signup form * environment has a list of Category subclasses that must be available for users; if there is only one category type available, no need of asking for category type * environment has a setting categories_menu which enables/disables the category menu. If it is disabled, then no need to ask for a color in the menu * add a configuration to the environment called disable_gender_icon. When it is false, don't display gender icons. * adding css for profile_data * adding required on label for schooling fixing javascript * adding fields on signup and option to admin manage * adding required message on required fields * adding partials for person/enterprise/community fields * adding methods for person/community/enterprise custom_fields * adding option to admin manage person fields
Daniela Feitosa
1 parent 20541556
Showing 36 changed files with 1538 additions and 107 deletions Show diff stats
app/controllers/admin/features_controller.rb
app/controllers/public/account_controller.rb
app/helpers/application_helper.rb
app/helpers/categories_helper.rb
app/helpers/profile_editor_helper.rb
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/organization.rb
app/models/person.rb
app/models/user.rb
app/views/account/_signup_form.rhtml
app/views/admin_panel/index.rhtml
app/views/categories/_form.rhtml
app/views/features/_manage_community_fields.rhtml
app/views/features/_manage_enterprise_fields.rhtml
app/views/features/_manage_person_fields.rhtml
app/views/features/manage_fields.rhtml
app/views/profile_editor/_community_fields.rhtml
app/views/profile_editor/_enterprise_fields.rhtml
@@ -15,4 +15,40 @@ class FeaturesController &lt; AdminController
     end
   end
+  def manage_fields
+    @person_fields = Person.fields
+    @enterprise_fields = Enterprise.fields
+    @community_fields = Community.fields
+  end
+
+  def manage_person_fields
+    environment.custom_person_fields = params[:person_fields]
+    if environment.save!
+      flash[:notice] = _('Custom person fields updated successfully.')
+    else
+      flash[:error] = _('Custom person fields not updated successfully.')
+    end
+    redirect_to :action => 'manage_fields'
+  end
+
+  def manage_enterprise_fields
+    environment.custom_enterprise_fields = params[:enterprise_fields]
+    if environment.save!
+      flash[:notice] = _('Custom enterprise fields updated successfully.')
+    else
+      flash[:error] = _('Custom enterprise fields not updated successfully.')
+    end
+    redirect_to :action => 'manage_fields'
+  end
+
+  def manage_community_fields
+    environment.custom_community_fields = params[:community_fields]
+    if environment.save!
+      flash[:notice] = _('Custom community fields updated successfully.')
+    else
+      flash[:error] = _('Custom community fields not updated successfully.')
+    end
+    redirect_to :action => 'manage_fields'
+  end
+
 end
@@ -14,6 +14,7 @@ class AccountController &lt; ApplicationController
   # action to perform login to the application
   def login
     @user = User.new
+    @person = @user.build_person
     return unless request.post?
     self.current_user = User.authenticate(params[:user][:login], params[:user][:password]) if params[:user]
     if logged_in?
@@ -46,8 +47,10 @@ class AccountController &lt; ApplicationController
       @user.terms_of_use = environment.terms_of_use
       @user.environment = environment
       @terms_of_use = environment.terms_of_use
+      @person = @user.build_person(params[:profile_data])
+      @person.environment = @user.environment
       if request.post? && params[self.icaptcha_field].blank?
-        @user.save!
+        @user.signup!
         self.current_user = @user
         owner_role = Role.find_by_name('owner')
         @user.person.affiliate(@user.person, [owner_role]) if owner_role
@@ -55,6 +58,7 @@ class AccountController &lt; ApplicationController
         flash[:notice] = _("Thanks for signing up!")
       end
     rescue ActiveRecord::RecordInvalid
+      @person.valid?
       render :action => 'signup'
     end
   end
@@ -19,7 +19,9 @@ module ApplicationHelper
   include DatesHelper
   include FolderHelper
-  
+
+  include ProfileEditorHelper
+
   # Displays context help. You can pass the content of the help message as the
   # first parameter or using template code inside a block passed to this
   # method. *Note*: the block is ignored if <tt>content</tt> is not
@@ -289,7 +291,6 @@ module ApplicationHelper
     @controller.send(:user)
   end
-
   def stylesheet_import(*sources)
     options = sources.last.is_a?(Hash) ? sources.pop : { }
     themed_source = options.delete(:themed_source) 
@@ -378,16 +379,14 @@ module ApplicationHelper
   end
   def profile_sex_icon( profile )
-    if profile.class == Person
-      sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
-      title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
-      sex = content_tag 'span',
-                        content_tag( 'span', sex ),
-                        :class => 'sex-'+sex,
-                        :title => title
-    else
-      sex = ''
-    end
+    return '' unless profile.is_a?(Person)
+    return '' unless !environment.enabled?('disable_gender_icon')
+    sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
+    title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
+    sex = content_tag 'span',
+                      content_tag( 'span', sex ),
+                      :class => 'sex-'+sex,
+                      :title => title
     sex
   end
@@ -692,6 +691,23 @@ module ApplicationHelper
     form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
+  def custom_field(profile, name, field_html, options = {})
+    result = ""
+    if (controller.action_name == 'signup')
+      if profile.signup_fields.include?(name)
+        result = field_html
+      end
+    else
+      if profile.active_fields.include?(name)
+        result = field_html
+      end
+    end
+    if profile.required_fields.include?(name)
+      result = required(result)
+    end
+    result
+  end
+
   def search_page_title(title, options={})
     title = "<h1>" + title + "</h1>"
     title += "<h2 align='center'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
@@ -35,7 +35,8 @@ module CategoriesHelper
   def select_category_type(field)
     value = params[field]
-    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(CategoriesHelper::TYPES, value)))
+    types = TYPES.select { |title,typename| environment.category_types.include?(typename) }
+    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(types, value)))
   end
 end
@@ -0,0 +1,362 @@
+module ProfileEditorHelper
+
+  include GetText
+
+  AREAS_OF_STUDY = [
+    N_('Agrometeorology'),
+    N_('Agronomy'),
+    N_('Foods'),
+    N_('Anthropology'),
+    N_('Architecture'),
+    N_('Arts'),
+    N_('Astronomy'),
+    N_('Librarianship'),
+    N_('Biosciences'),
+    N_('Biophysics'),
+    N_('Biology'),
+    N_('Biotechnology'),
+    N_('Botany'),
+    N_('Science Politics'),
+    N_('Accounting and Actuarial Science'),
+    N_('Morphologic Sciences'),
+    N_('Computation'),
+    N_('Rural Development'),
+    N_('Law'),
+    N_('Ecology'),
+    N_('Economy'),
+    N_('Education'),
+    N_('Long-distance Education'),
+    N_('Physical Education'),
+    N_('Professional Education'),
+    N_('Nursing'),
+    N_('Engineerings'),
+    N_('Basic and Average education'),
+    N_('Statistics'),
+    N_('Stratigraphy'),
+    N_('Pharmacy'),
+    N_('Pharmacology'),
+    N_('Philosophy'),
+    N_('Physics'),
+    N_('Plant Protection'),
+    N_('Genetics'),
+    N_('Geosciences'),
+    N_('Geography'),
+    N_('Geology'),
+    N_('Hydrology'),
+    N_('Hydromechanics'),
+    N_('History'),
+    N_('Horticulture'),
+    N_('Informatics'),
+    N_('Interdisciplinary'),
+    N_('Journalism'),
+    N_('Letters'),
+    N_('Languages'),
+    N_('Mathematics'),
+    N_('Medicines'),
+    N_('Medicine'),
+    N_('Metallurgy'),
+    N_('Microbiology'),
+    N_('Mineralogy'),
+    N_('Music'),
+    N_('Nutrition'),
+    N_('Odontology'),
+    N_('Paleontology'),
+    N_('Petrology'),
+    N_('Production'),
+    N_('Psychology'),
+    N_('Psychiatry'),
+    N_('Quality'),
+    N_('Chemistry'),
+    N_('Health'),
+    N_('Remote Sensing'),
+    N_('Forestry'),
+    N_('Sociology'),
+    N_('Ground'),
+    N_('Theater'),
+    N_('Transport'),
+    N_('Urbanism'),
+    N_('Veterinary Medicine'),
+    N_('Zoology'),
+    N_('Zootecnia'),
+    N_('Others')
+  ]
+
+  COUNTRIES = [
+    ("Afeganistão (افغانستان)"),
+    ("África do Sul (South Africa)"),
+    ("Albânia (Shqipëria)"),
+    ("Alemanha (Deutschland)"),
+    ("Andorra"),
+    ("Angola"),
+    ("Anguila (Anguilla)"),
+    ("Antártica (Antarctica)"),
+    ("Antígua e Barbuda (Antigua and Barbuda)"),
+    ("Antilhas Holandesas (Netherlands Antilles)"),
+    ("Arábia Saudita (العربية السعودية)"),
+    ("Argélia (الجمهورية الجزائرية)"),
+    ("Argentina"),
+    ("Armênia (Հայաստան)"),
+    ("Aruba"),
+    ("Austrália (Australia)"),
+    ("Áustria (Österreich)"),
+    ("Azerbaijão (Azərbaycan)"),
+    ("Bahamas"),
+    ("Bangladesh (বাংলাদেশ)"),
+    ("Barbados"),
+    ("Barein (بحرين)"),
+    ("Bélgica (België)"),
+    ("Belize"),
+    ("Benin (Bénin)"),
+    ("Bermudas (Bermuda)"),
+    ("Bielo-Rússia (Белару́сь)"),
+    ("Bolívia (Bolivia)"),
+    ("Bósnia-Herzegovina (Bosna i Hercegovina)"),
+    ("Botsuana (Botswana)"),
+    ("Brasil"),
+    ("Brunei (Brunei Darussalam)"),
+    ("Bulgária (България)"),
+    ("Burkina Fasso (Burkina Faso)"),
+    ("Burundi (Uburundi)"),
+    ("Butão (འབྲུག་ཡུལ)"),
+    ("Cabo Verde"),
+    ("Camarões (Cameroun)"),
+    ("Camboja (Kampuchea)"),
+    ("Canadá (Canada)"),
+    ("Catar (قطر)"),
+    ("Cazaquistão (Қазақстан)"),
+    ("Chade (Tchad)"),
+    ("Chile"),
+    ("China (中国)"),
+    ("Chipre (Κυπρος)"),
+    ("Cidade do Vaticano (Città del Vaticano)"),
+    ("Cingapura (Singapura)"),
+    ("Colômbia (Colombia)"),
+    ("Comores"),
+    ("Congo"),
+    ("Congo, República democrática do (Congo, Democratic Republic of the)"),
+    ("Coréia do Norte (조선)"),
+    ("Coréia do Sul (한국)"),
+    ("Costa do Marfim (Côte d'Ivoire)"),
+    ("Costa Rica"),
+    ("Croácia (Hrvatska)"),
+    ("Cuba"),
+    ("Dinamarca (Danmark)"),
+    ("Djibuti (Djibouti)"),
+    ("Dominica"),
+    ("Egito (مصر)"),
+    ("El Salvador"),
+    ("Emirados Árabes Unidos (الإمارات العربيّة المتّحد)"),
+    ("Equador (Ecuador)"),
+    ("Eritréia (Ertra)"),
+    ("Eslováquia (Slovensko)"),
+    ("Eslovênia (Slovenija)"),
+    ("Espanha (España)"),
+    ("Estados Unidos (United States)"),
+    ("Estônia (Eesti)"),
+    ("Etiópia (Ityop'iya)"),
+    ("Fiji"),
+    ("Filipinas (Pilipinas)"),
+    ("Finlândia (Suomi)"),
+    ("França (France)"),
+    ("Gabão (Gabon)"),
+    ("Gâmbia (Gambia)"),
+    ("Gana (Ghana)"),
+    ("Geórgia (საქართველო)"),
+    ("Geórgia do Sul e Ilhas Sandwich do Sul (South Georgia and the South Sandwich Islands)"),
+    ("Gibraltar"),
+    ("Granada (Grenada)"),
+    ("Grécia (Eλλας)"),
+    ("Groenlândia (Greenland)"),
+    ("Guadalupe (Guadeloupe)"),
+    ("Guam"),
+    ("Guatemala"),
+    ("Guernsey"),
+    ("Guiana (Guyana)"),
+    ("Guiana Francesa (French Guiana)"),
+    ("Guiné (Guinée)"),
+    ("Guiné-Bissau"),
+    ("Guiné Equatorial (Guinea Ecuatorial)"),
+    ("Haiti (Haïti)"),
+    ("Holanda (Nederland)"),
+    ("Honduras"),
+    ("Hong Kong"),
+    ("Hungria (Magyarország)"),
+    ("Iêmen (اليمن)"),
+    ("Ilha Aland (Aland Islands)"),
+    ("Ilha Bouvet (Bouvet Island)"),
+    ("Ilha Christmas (Christmas Island)"),
+    ("Ilha de Man (Isle of Man)"),
+    ("Ilha Norfolk (Norfolk Island)"),
+    ("Ilhas Cayman (Cayman Islands)"),
+    ("Ilhas Cocos (Keeling) (Cocos Islands)"),
+    ("Ilhas Cook (Cook Islands)"),
+    ("Ilhas Falkland (Malvinas) (Falkland Islands)"),
+    ("Ilhas Faroé (Faroe Islands)"),
+    ("Ilhas Heard e McDonald (Heard Island and McDonald Islands)"),
+    ("Ilhas Marianas do Norte (Northern Mariana Islands)"),
+    ("Ilhas Marshall (Marshall Islands)"),
+    ("Ilhas Maurício (Mauritius)"),
+    ("Ilhas Reunião (Reunion)"),
+    ("Ilhas Salomão (Solomon Islands)"),
+    ("Ilhas Svalbard e Jan Mayen (Svalbard and Jan Mayen)"),
+    ("Ilhas Tokelau (Tokelau)"),
+    ("Ilhas Turks e Caicos (Turks and Caicos Islands)"),
+    ("Ilhas Virgens, Britânicas (Virgin Islands, British)"),
+    ("Ilhas Virgens, EUA (Virgin Islands, U.S.)"),
+    ("Ilhas Wallis e Futuna (Wallis and Futuna)"),
+    ("Índia (India)"),
+    ("Indonésia (Indonesia)"),
+    ("Irã (ایران)"),
+    ("Iraque (العراق)"),
+    ("Irlanda (Ireland)"),
+    ("Islândia (Ísland)"),
+    ("Israel (ישראל)"),
+    ("Itália (Italia)"),
+    ("Jamaica"),
+    ("Japão (日本)"),
+    ("Jordânia (الارد)"),
+    ("Kiribati"),
+    ("Kuwait (الكويت)"),
+    ("Laos (ນລາວ)"),
+    ("Lesoto (Lesotho)"),
+    ("Letônia (Latvija)"),
+    ("Líbano (لبنان)"),
+    ("Libéria (Liberia)"),
+    ("Líbia (ليبية)"),
+    ("Liechtenstein"),
+    ("Lituânia (Lietuva)"),
+    ("Luxemburgo (Lëtzebuerg)"),
+    ("Macau (Macao)"),
+    ("Macedônia (Македонија)"),
+    ("Madagáscar (Madagasikara)"),
+    ("Maiote (Mayotte)"),
+    ("Malásia (Malaysia)"),
+    ("Malavi (Malawi)"),
+    ("Maldivas (ގުޖޭއްރާ ޔާއްރިހޫމްޖ)"),
+    ("Mali"),
+    ("Malta"),
+    ("Marrocos (مغرب)"),
+    ("Martinica (Martinique)"),
+    ("Mauritânia (موريتانية)"),
+    ("México"),
+    ("Micronésia (Micronesia)"),
+    ("Moçambique"),
+    ("Moldávia (Moldova)"),
+    ("Mônaco (Monaco)"),
+    ("Mongólia (Монгол Улс)"),
+    ("Montserrat"),
+    ("Myanmar (Լեռնային Ղարաբաղ)"),
+    ("Namíbia (Namibia)"),
+    ("Nauru (Naoero)"),
+    ("Nepal (नेपाल)"),
+    ("Nicarágua (Nicaragua)"),
+    ("Níger (Niger)"),
+    ("Nigéria (Nigeria)"),
+    ("Niue"),
+    ("Noruega (Norge)"),
+    ("Nova Caledônia (New Caledonia)"),
+    ("Nova Jérsei (Jersey)"),
+    ("Nova Zelândia (New Zealand)"),
+    ("Omã (عمان)"),
+    ("Palau (Belau)"),
+    ("Palestina (Palestine)"),
+    ("Panamá"),
+    ("Papua-Nova Guiné (Papua New Guinea)"),
+    ("Paquistão (پاکستان)"),
+    ("Paraguai (Paraguay)"),
+    ("Peru (Perú)"),
+    ("Pitcairn"),
+    ("Polinésia Francesa (French Polynesia)"),
+    ("Polônia (Polska)"),
+    ("Porto Rico (Puerto Rico)"),
+    ("Portugal"),
+    ("Quênia (Kenya)"),
+    ("Quirquistão (Кыргызстан)"),
+    ("Reino Unido (United Kingdom)"),
+    ("República Centro-Africana (République Centrafricaine)"),
+    ("República Dominicana (Dominican Republic)"),
+    ("República Tcheca (Česko)"),
+    ("Romênia (România)"),
+    ("Ruanda (Rwanda)"),
+    ("Rússia (Россия)"),
+    ("Saara Ocidental (صحراوية)"),
+    ("Samoa"),
+    ("Samoa Americana (American Samoa)"),
+    ("San Marino"),
+    ("Santa Helena (Saint Helena)"),
+    ("Santa Lúcia (Saint Lucia)"),
+    ("São Cristóvão e Névis (Saint Kitts and Nevis)"),
+    ("São Pierre e Miquelon (Saint Pierre and Miquelon)"),
+    ("São Tomé e Príncipe (São Tomé and Príncipe)"),
+    ("São Vincente e Granadinas (Saint Vincent and the Grenadines)"),
+    ("Seicheles (Seychelles)"),
+    ("Senegal (Sénégal)"),
+    ("Serra Leoa (Sierra Leone)"),
+    ("Sérvia e Montenegro (Србија и Црна Гора)"),
+    ("Síria (سورية)"),
+    ("Somália (Soomaaliya)"),
+    ("Sri Lanka"),
+    ("Suazilândia (Swaziland)"),
+    ("Sudão (السودان)"),
+    ("Suécia (Sverige)"),
+    ("Suíça (Schweiz)"),
+    ("Suriname"),
+    ("Tailândia (ราชอาณาจักรไทย)"),
+    ("Taiwan (台灣)"),
+    ("Tajiquistão (Тоҷикистон)"),
+    ("Tanzânia (Tanzania)"),
+    ("Território Britânico do Oceano Índico (British Indian Ocean Territory)"),
+    ("Territórios Franceses do Sul (French Southern Territories)"),
+    ("Territórios Insulares dos Estados Unidos (United States minor outlying islands)"),
+    ("Timor Leste (Timor-Leste)"),
+    ("Togo"),
+    ("Tonga"),
+    ("Trinidad e Tobago (Trinidad and Tobago)"),
+    ("Tunísia (تونس)"),
+    ("Turcomenistão (Türkmenistan)"),
+    ("Turquia (Türkiye)"),
+    ("Tuvalu"),
+    ("Ucrânia (Україна)"),
+    ("Uganda"),
+    ("Uruguai (Uruguay)"),
+    ("Uzbequistão (O'zbekiston)"),
+    ("Vanuatu"),
+    ("Venezuela"),
+    ("Vietnã (Việt Nam)"),
+    ("Zâmbia (Zambia)"),
+    ("Zimbábue (Zimbabwe)")
+  ]
+
+  SCHOOLING = [
+    N_('Post-Doctoral'),
+    N_('Ph.D.'),
+    N_('Masters'),
+    N_('Undergraduate'),
+    N_('Graduate'),
+    N_('High School'),
+    N_('Elementary School')
+  ]
+
+  SCHOOLING_STATUS = [
+    N_('Concluded'),
+    N_('Incomplete'),
+    N_('Ongoing')
+  ]
+
+  def select_area(title, object, method, options)
+    labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::AREAS_OF_STUDY.map{|s| [gettext(s), s]}, {}, options))
+  end
+
+  def select_country(title, object, method, options)
+    labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::COUNTRIES.map{|s| [s]}, {}, options))
+  end
+
+  def select_schooling(object, method, options)
+    select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::SCHOOLING.map{|s| [gettext(s), s]}, {}, options)
+  end
+
+  def select_schooling_status(object, method, options)
+    select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::SCHOOLING_STATUS.map{|s| [gettext(s), s]}, {}, options)
+  end
+
+end
 class Community < Organization
   N_('Community')
+  N_('Language')
   settings_items :description
+  settings_items :language
   xss_terminate :only => [ :name, :address, :contact_phone, :description ]
+  FIELDS = %w[
+    description
+    language
+  ]
+
+  def self.fields
+    super + FIELDS
+  end
+
+  def validate
+    self.required_fields.each do |field|
+      if self.send(field).blank?
+          self.errors.add(field, _('%{fn} is mandatory'))
+      end
+    end
+  end
+
+  def active_fields
+    environment ? environment.active_community_fields : []
+  end
+
+  def required_fields
+    environment ? environment.required_community_fields : []
+  end
+
   def name=(value)
     super(value)
     self.identifier = value.to_slug
@@ -8,6 +8,40 @@ class Enterprise &lt; Organization
   extra_data_for_index :product_categories
+  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
+
+  FIELDS = %w[
+    zip_code
+    city
+    state
+    country
+    organization_website
+    historic_and_current_context
+    activities_short_description
+  ]
+
+  def self.fields
+    super + FIELDS
+  end
+
+  def validate
+    self.required_fields.each do |field|
+      if self.send(field).blank?
+          self.errors.add(field, _('%{fn} is mandatory'))
+      end
+    end
+  end
+
+  def active_fields
+    environment ? environment.active_enterprise_fields : []
+  end
+
+  def required_fields
+    environment ? environment.required_enterprise_fields : []
+  end
+
   def product_categories
     products.map{|p| p.category_full_name}.compact
   end
@@ -32,6 +32,8 @@ class Environment &lt; ActiveRecord::Base
       'disable_categories' => _('Disable categories'),
       'disable_cms' => _('Disable CMS'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
+      'disable_gender_icon' => _('Disable gender icon'),
+      'disable_categories_menu' => _('Disable the categories menu'),
     }
   end
@@ -231,6 +233,109 @@ class Environment &lt; ActiveRecord::Base
     end
   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)}
+    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 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)}
+  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 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)}
+  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 category_types
+    self.settings[:category_types].nil? ? ['Category'] : self.settings[:category_types]
+  end
+
+  def category_types=(values)
+    self.settings[:category_types] = values
+  end
+
   # Whether this environment should force having 'www.' in its domain name or
   # not. Defauls to false.
   #
@@ -43,6 +43,29 @@ class Organization &lt; Profile
     !self.validation_info.nil?
   end
+  FIELDS = %w[
+    nickname
+    contact_person
+    contact_phone
+    contact_email
+    legal_form
+    economic_activity
+    management_information
+    address
+  ]
+
+  def self.fields
+    FIELDS
+  end
+
+  def required_fields
+    []
+  end
+
+  def active_fields
+    []
+  end
+
   N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated')
   settings_items :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj
@@ -41,6 +41,70 @@ class Person &lt; Profile
     friends.delete(friend)
   end
+  FIELDS = %w[
+  nickname
+  sex
+  address
+  zip_code
+  city
+  state
+  country
+  nationality
+  birth_date
+  cell_phone
+  comercial_phone
+  schooling
+  professional_activity
+  organization
+  organization_website
+  area_of_study
+  custom_area_of_study
+  formation
+  custom_formation
+  contact_phone
+  contact_information
+  ]
+
+  def self.fields
+    FIELDS
+  end
+
+  def validate
+    self.required_fields.each do |field|
+      if self.send(field).blank?
+        unless (field == 'custom_area_of_study' && self.area_of_study != 'Others') || (field == 'custom_formation' && self.formation != 'Others')
+          self.errors.add(field, _('%{fn} is mandatory'))
+        end
+      end
+    end
+  end
+
+  before_save do |person|
+    person.custom_formation = nil if (! person.formation.nil? && person.formation != 'Others')
+    person.custom_area_of_study = nil if (! person.area_of_study.nil? && person.area_of_study != 'Others')
+  end
+
+  def active_fields
+    environment ? environment.active_person_fields : []
+  end
+
+  def required_fields
+    environment ? environment.required_person_fields : []
+  end
+
+  def signup_fields
+    environment ? environment.signup_person_fields : []
+  end
+
+  N_('Cell phone'); N_('Comercial phone'); N_('Nationality'); N_('Schooling'); N_('Area of study'); N_('Professional activity'); N_('Organization'); N_('Organization website');
+  settings_items :cell_phone, :comercial_phone, :nationality, :schooling, :area_of_study, :professional_activity, :organization, :organization_website
+
+  N_('Schooling status')
+  settings_items :schooling_status
+
+  N_('Formation'); N_('Custom formation'); N_('Custom area of study');
+  settings_items :formation, :custom_formation, :custom_area_of_study
+
   N_('Contact information'); N_('Birth date'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
   settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country, :zip_code
@@ -28,6 +28,13 @@ class User &lt; ActiveRecord::Base
     user.person.name ||= user.login
     user.person.update_attributes(:identifier => user.login, :user_id => user.id, :environment_id => user.environment_id)
   end
+
+  def signup!
+    User.transaction do
+      self.save!
+      self.person.save!
+    end
+  end
   has_one :person, :dependent => :destroy
   belongs_to :environment
-<%= error_messages_for :user %>
+<%= error_messages_for :user, :person %>
+
+<% if ! defined? hidden_atention || ! hidden_atention %>
+<p/>
+<div class="atention">
+<%= _('Dear user, welcome to the %s network. To start your participation
+in this space, fill in the fields below. After this operation, your login and
+password will be registered, allowing you to create communities and enterprises
+in this environment.') % environment.name %>
+</div>
+<% end %>
 <% labelled_form_for :user, @user,
    :html => { :help=>_('Fill all this fields to join in this environment. <p/> If you forgot your password, do not create a new account, click on the "<b>I forgot my password!</b>" link. ;-)'), :id => 'profile-data'
@@ -22,6 +32,10 @@
     :help => help=_('To confirm, repeat your password.')) %>
 <small><%= help %></small>
+<% labelled_fields_for :profile_data, @person do |f| %>
+  <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
+<% end %>
+
 <%= icaptcha_field() %>
 <% if @terms_of_use %>
@@ -41,16 +55,6 @@
   <%= hidden_field_tag :new_user, true %>
 <% end %>
-<% if ! defined? hidden_atention || ! hidden_atention %>
-<p/>
-<div class="atention">
-<%= _('Dear user, welcome to the %s network. To start your participation
-in this space, fill in the fields below. After this operation, your login and
-password will be registered, allowing you to create communities and enterprises
-in this environment.') % environment.name %>
-</div>
-<% end %>
-
 <% button_bar do %>
   <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
 <% end %>
@@ -11,4 +11,6 @@
   <li><%= link_to _('Manage User roles'), :controller => 'role' %></li>
   <li><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></li>
   <li><%= link_to _('Manage Templates'), :action => 'manage_templates' %></li>
+  <li><%= link_to _('Edit Templates'), :action => 'edit_templates' %></li>
+  <li><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></li>
 </ul>
@@ -9,11 +9,15 @@
       <%= hidden_field_tag('parent_id', @category.parent.id) %>
       <%= hidden_field_tag('type', @category.parent.class.name) %>
     <% else %>
-      <%= select_category_type :type %>
+      <% if environment.category_types.length > 1 %>
+        <%= select_category_type :type %>
+      <% else %>
+        <%= hidden_field_tag('type', environment.category_types.to_s) %>
+      <% end%>
     <% end %>
   <% end %>
-  <%= select_color_for_category %>
+  <%= select_color_for_category if !environment.enabled?('disable_categories_menu') %>
   <%= required f.text_field('name') %>
@@ -0,0 +1,46 @@
+<h2><%= _('Manage community fields') %></h2>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
+
+<table id='community_fields_conf'>
+  <tr>
+    <th><%= _('Field') %></th>
+    <th><%= _('Active') %></th>
+    <th><%= _('Required') %></th>
+  </tr>
+  <% @community_fields.each do |field| %>
+  <tr>
+    <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
+    <td>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=!this.checked" %>
+      <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
+    </td>
+    <td>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required') %>
+      <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
+    </td>
+  </tr>
+  <% end %>
+</table>
+
+<script type='text/javascript'>
+  var trs = $$('#community_fields_conf tr');
+  var tr, td2;
+  for ( var i=0; tr=trs[i]; i++ ) {
+    if ( td2 = tr.getElementsByTagName('td')[1] ) {
+      td2.getElementsByTagName('input')[0].onclick();
+    }
+  }
+</script>
+
+<div>
+  <% button_bar do %>
+    <%= submit_button('save', _('Save changes')) %>
+  <% end %>
+</div>
+
+<% end %>
+
+
+
+
@@ -0,0 +1,46 @@
+<h2><%= _('Manage enterprise fields') %></h2>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
+
+<table id='enterprise_fields_conf'>
+  <tr>
+    <th><%= _('Field') %></th>
+    <th><%= _('Active') %></th>
+    <th><%= _('Required') %></th>
+  </tr>
+  <% @enterprise_fields.each do |field| %>
+  <tr>
+    <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
+    <td>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=!this.checked" %>
+      <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
+    </td>
+    <td>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required') %>
+      <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
+    </td>
+  </tr>
+  <% end %>
+</table>
+
+<script type='text/javascript'>
+  var trs = $$('#enterprise_fields_conf tr');
+  var tr, td2;
+  for ( var i=0; tr=trs[i]; i++ ) {
+    if ( td2 = tr.getElementsByTagName('td')[1] ) {
+      td2.getElementsByTagName('input')[0].onclick();
+    }
+  }
+</script>
+
+<div>
+  <% button_bar do %>
+    <%= submit_button('save', _('Save changes')) %>
+  <% end %>
+</div>
+
+<% end %>
+
+
+
+
@@ -0,0 +1,52 @@
+<h2><%= _('Manage person fields') %></h2>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
+
+<table id='person_fields_conf'>
+  <tr>
+    <th><%= _('Field') %></th>
+    <th><%= _('Active') %></th>
+    <th><%= _('Required') %></th>
+    <th><%= _('Display on signup?') %></th>
+  </tr>
+  <% @person_fields.each do |field| %>
+  <tr>
+    <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
+    <td>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked" %>
+      <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
+    </td>
+    <td>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required') %>
+      <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
+    </td>
+    <td>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup') %>
+      <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
+    </td>
+  </tr>
+  <% end %>
+</table>
+
+<script type='text/javascript'>// <!--
+  var trs = $$('#person_fields_conf tr');
+  var tr, td2;
+  for ( var i=0; tr=trs[i]; i++ ) {
+    if ( td2 = tr.getElementsByTagName('td')[1] ) {
+      td2.getElementsByTagName('input')[0].onclick();
+    }
+  }
+  // -->
+</script>
+
+<div>
+  <% button_bar do %>
+    <%= submit_button('save', _('Save changes')) %>
+  <% end %>
+</div>
+
+<% end %>
+
+
+
+
@@ -0,0 +1,5 @@
+<%= render :partial => 'manage_person_fields' %>
+
+<%= render :partial => 'manage_enterprise_fields' %>
+
+<%= render :partial => 'manage_community_fields' %>
@@ -0,0 +1,2 @@
+<%= custom_field(@profile, 'language', f.text_field(:language)) %>
+<%= custom_field(@profile, 'description', f.text_area(:description, :rows => 5)) %>
@@ -0,0 +1,11 @@
+<%= custom_field(@profile, 'contact_phone', f.text_field(:contact_phone)) %>
+<%= custom_field(@profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address))) %>
+
+<%= custom_field(@profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code))) %>
+<%= custom_field(@profile, 'city', f.text_field(:city)) %>
+<%= custom_field(@profile, 'state', f.text_field(:state)) %>
+<%= custom_field(@profile, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
+<%= custom_field(@profile, 'organization_website', f.text_field(:organization_website)) %>
+<%= custom_field(@profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5)) %>
+<%= custom_field(@profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5)) %>
+<%= custom_field(@profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
 <h2><%= _('General information') %></h2>
+  <%= required_fields_message if @profile.required_fields.any? %>
+
 <div class="formfieldline">
   <label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
   <div class="formfield type-text">
@@ -9,13 +11,16 @@
   </div>
   <%= f.text_field(:acronym) %>
-  <%= f.text_field(:address, 'size' => 50) if @profile.enterprise? %>
   <%= f.text_field(:foundation_year) %>
-  <%= f.text_field(:contact_person) %>
-  <%= f.text_field(:contact_email) %>
-  <%= f.text_field(:economic_activity) %>
-  <%= f.text_area(:description, :rows => 5) if @profile.community? %>
+  <%= custom_field(@profile, 'contact_person', f.text_field(:contact_person)) %>
+  <%= custom_field(@profile, 'contact_email', f.text_field(:contact_email)) %>
+  <%= custom_field(@profile, 'economic_activity', f.text_field(:economic_activity)) %>
+  <%= custom_field(@profile, 'description', f.text_area(:description, :rows => 5)) if @profile.community? %>
   <%= f.check_box(:enable_contact_us) if @profile.enterprise? %>
+  
+  <%= render :partial => 'community_fields', :locals => { :f => f } if @profile.community? %>
+  <%= render :partial => 'enterprise_fields', :locals => { :f => f } if @profile.enterprise? %>
+
   <h1><%= _('Moderation options') %></h1>
   <div style='margin-bottom: 1em'>
   <%= _('New members must be approved:')%>
 <h2><%= _('Personal information') %></h2>
-  <%= f.text_field(:email)%>
+  <%= required_fields_message %>
+
+  <%= required f.text_field(:email)%>
+  <%= labelled_form_field _('Full name'), text_field(:profile_data, :name) %>
   <%= render :partial => 'person_form', :locals => {:f => f} %>
-<%= f.text_field(:nickname, :maxlength => 16, :size => 30) %>
-<div>
-  <small><em><%= _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') %></em></small>
-</div>
-
-<%= f.text_field(:name) %>
-<%= f.text_field(:contact_information) %>
-<%= f.text_field(:contact_phone) %>
-<%# use :size => 3 if you want 3 radios by line %>
-<%= f.radio_group :profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ] %>
-<%= f.text_field(:birth_date) %>
-<%= labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address)) %>
-<%= labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code)) %>
-<%= f.text_field(:city) %>
-<%= f.text_field(:state) %>
-<%= f.text_field(:country) %>
+<% @person ||= @profile %>
+
+<%= custom_field(@person, 'nickname', f.text_field(:nickname, :maxlength => 16, :size => 30)) %>
+
+<% nickname_tip = "<div><small><em>" + _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') + "</em></small></div>" %>
+<% if controller.action_name == 'signup' %>
+  <% if @person.signup_fields.include?('nickname') %>
+    <%= nickname_tip %>
+  <% end%>
+<% elsif @person.active_fields.include?('nickname') %>
+  <%= nickname_tip %>
+<% end %>
+
+<%= custom_field(@person, 'contact_information', f.text_field(:contact_information)) %>
+<%= custom_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone))) %>
+<%= custom_field(@person, 'cell_phone', f.text_field(:cell_phone)) %>
+<%= custom_field(@person, 'comercial_phone', f.text_field(:comercial_phone)) %>
+<%= custom_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
+<%= custom_field(@person, 'birth_date', f.text_field(:birth_date)) %>
+<%= custom_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address))) %>
+<%= custom_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code))) %>
+<%= custom_field(@person, 'city', f.text_field(:city)) %>
+<%= custom_field(@person, 'state', f.text_field(:state)) %>
+<%= custom_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
+<%= custom_field(@person, 'nationality', f.text_field(:nationality)) %>
+
+<% if @person.active_fields.include?('schooling') %>
+  <% schooling_label = "<label class='formlabel' for='profile_data_schooling'>#{_('Schooling')}</label>" %>
+  <div class="formfieldline"><%= @person.required_fields.include?('schooling') ? required(schooling_label) : schooling_label %>
+      <div class="formfield type-select">
+        <%= custom_field(@person, 'schooling', select_schooling('profile_data', 'schooling', {:class => 'select-schooling'})) %>
+        <%= custom_field(@person, 'schooling_status', select_schooling_status('profile_data', 'schooling_status', {:class => 'select-schooling'})) %>
+      </div>
+  </div>
+<% end %>
+
+<script type='text/javascript'>
+  function toggle_text_field(id, span_id) {
+    if ($(id).value == "Others") {
+      $(span_id).show(); return false;
+    } else {
+      $(span_id).hide(); return false;
+    }
+  }
+</script>
+
+<%= custom_field(@person, 'formation', select_area(_('Formation'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %>
+
+<span id='profile_data_custom_formation_span' <%= "style='display:none'" if ! ['Others', nil].include?(@person.formation) %> >
+  <%= custom_field(@person, 'custom_formation', f.text_field(:custom_formation)) %>
+</span>
+<%= observe_field 'profile_data_formation', :function =>'toggle_text_field("profile_data_formation", "profile_data_custom_formation_span")' %>
+
+<%= custom_field(@person, 'area_of_study', select_area(_('Area of study'), 'profile_data', 'area_of_study', {:class => 'type-select-full-line'})) %>
+
+<span id='profile_data_custom_area_of_study_span' <%= "style='display:none'" if ! ['Others', nil].include?(@person.area_of_study) %> >
+  <%= custom_field(@person, 'custom_area_of_study', f.text_field(:custom_area_of_study)) %>
+</span>
+<%= observe_field 'profile_data_area_of_study', :function =>'toggle_text_field("profile_data_area_of_study", "profile_data_custom_area_of_study_span")' %>
+
+<%= custom_field(@person, 'professional_activity', f.text_field(:professional_activity)) %>
+<%= custom_field(@person, 'organization', f.text_field(:organization)) %>
+<%= custom_field(@person, 'organization_website', f.text_field(:organization_website)) %>
+
@@ -2,7 +2,7 @@
 <%= error_messages_for :profile %>
-<% labelled_form_for :profile_data, @profile, :html => { :multipart => true } do |f| %>
+<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
@@ -18,7 +18,7 @@
     <%= _('This profile is:') %>
   </p>
-  <% if profile.kind_of?(Person) %>
+  <% if profile.person? %>
   <table>
     <tr>
       <th></th>
@@ -0,0 +1,10 @@
+#profile-data .type-text input,
+#profile-data .type-password input,
+#profile-data .type-select select {
+  width: 220px
+}
+
+#profile-data .type-select select.select-schooling {
+  width: 108px;
+}
+
@@ -594,6 +594,12 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'form', :attributes => { :action => /^https:\/\// }
   end
+  should 'render person partial' do
+    Environment.any_instance.expects(:signup_person_fields).returns(['contact_phone']).at_least_once
+    get :signup
+    assert_tag :tag => 'input', :attributes => { :name => "profile_data[contact_phone]" }
+  end
+
   protected
     def new_user(options = {}, extra_options ={})
       data = {:profile_data => person_data}
@@ -137,4 +137,41 @@ class CategoriesControllerTest &lt; Test::Unit::TestCase
     post :new, :category => { :display_in_menu => '1' }
   end
+  should 'not display color selection if environment.categories_menu is false' do
+    env.enable('disable_categories_menu')
+    env.save!
+    get :new
+
+    assert_no_tag :tag => 'select', :attributes => { :name => "category[display_color]" }
+  end
+
+  should 'display color selection if environment.categories_menu is true' do
+    env.disable('disable_categories_menu')
+    env.save!
+    get :new
+
+    assert_tag :tag => 'select', :attributes => { :name => "category[display_color]" }
+  end
+
+  should 'not display category_type if only one category is available' do
+    env.category_types = ['Category']
+    get :new
+
+    assert_no_tag :tag => 'select', :attributes => { :name => "type" }
+  end
+
+  should 'have hidden_tag type if only one category is available' do
+    env.category_types = ['Category']
+    env.save!
+    get :new
+
+    assert_tag :tag => 'input', :attributes => { :name => 'type', :value => "Category", :type => 'hidden' }
+  end
+
+ should 'display category_type if more than one category is available' do
+    env.category_types = 'Category', 'ProductCategory'
+    get :new
+
+    assert_tag :tag => 'select', :attributes => { :name => "type" }
+  end
 end
@@ -76,8 +76,78 @@ class FeaturesControllerTest &lt; Test::Unit::TestCase
     post :index
     assert_tag :tag => 'select', :attributes => { :name => 'environment[organization_approval_method]' }, :descendant => { :tag => 'option', :attributes => { :value => 'region', :selected => true } }
+  end
+
+  should 'list possible person fields' do
+    uses_host 'anhetegua.net'
+    Person.expects(:fields).returns(['cell_phone', 'comercial_phone']).at_least_once
+    get :manage_fields
+    assert_template 'manage_fields'
+    Person.fields.each do |field|
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "person_fields[#{field}][active]"})
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "person_fields[#{field}][required]"})
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "person_fields[#{field}][signup]"})
+    end
+  end
+
+  should 'update custom_person_fields' do
+    uses_host 'anhetegua.net'
+    e = Environment.find(2)
+    Person.expects(:fields).returns(['cell_phone', 'comercial_phone']).at_least_once
+
+    post :manage_person_fields, :person_fields => { :cell_phone => {:active => true, :required => true }}
+    assert_redirected_to :action => 'manage_fields'
+    e.reload
+    assert_equal true, e.custom_person_fields['cell_phone']['active']
+    assert_equal true, e.custom_person_fields['cell_phone']['required']
+  end
+  should 'disable check_box for required if active is not checked' 
+
+  should 'list possible enterprise fields' do
+    uses_host 'anhetegua.net'
+    Enterprise.expects(:fields).returns(['contact_person', 'contact_email']).at_least_once
+    get :manage_fields
+    assert_template 'manage_fields'
+    Enterprise.fields.each do |field|
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "enterprise_fields[#{field}][active]"})
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "enterprise_fields[#{field}][required]"})
+    end
+  end
+
+  should 'update custom_enterprise_fields' do
+    uses_host 'anhetegua.net'
+    e = Environment.find(2)
+    Enterprise.expects(:fields).returns(['contact_person', 'contact_email']).at_least_once
+
+    post :manage_enterprise_fields, :enterprise_fields => { :contact_person => {:active => true, :required => true }}
+    assert_redirected_to :action => 'manage_fields'
+    e.reload
+    assert_equal true, e.custom_enterprise_fields['contact_person']['active']
+    assert_equal true, e.custom_enterprise_fields['contact_person']['required']
+  end
+
+  should 'list possible community fields' do
+    uses_host 'anhetegua.net'
+    Community.expects(:fields).returns(['contact_person', 'contact_email']).at_least_once
+    get :manage_fields
+    assert_template 'manage_fields'
+    Community.fields.each do |field|
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "community_fields[#{field}][active]"})
+      assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "community_fields[#{field}][required]"})
+    end
+  end
+
+  should 'update custom_community_fields' do
+    uses_host 'anhetegua.net'
+    e = Environment.find(2)
+    Community.expects(:fields).returns(['contact_person', 'contact_email']).at_least_once
+    post :manage_community_fields, :community_fields => { :contact_person => {:active => true, :required => true }}
+    assert_redirected_to :action => 'manage_fields'
+    e.reload
+    assert_equal true, e.custom_community_fields['contact_person']['active']
+    assert_equal true, e.custom_community_fields['contact_person']['required']
   end
 end
@@ -105,66 +105,68 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   end
   should 'filter html from contact_person to organization' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     contact = "name <strong id='name_html_test'>with</strong> html"
     post :edit, :profile => org.identifier, :profile_data => { :contact_person => contact }
     assert_sanitized assigns(:profile).contact_person
   end
   should 'filter html from acronym organization' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     value = "name <strong id='name_html_test'>with</strong> html"
     post :edit, :profile => org.identifier, :profile_data => { :acronym => value }
     assert_sanitized assigns(:profile).acronym
   end
   should 'filter html from legal_form organization' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     value = "name <strong id='name_html_test'>with</strong> html"
     post :edit, :profile => org.identifier, :profile_data => { :legal_form => value }
     assert_sanitized assigns(:profile).legal_form
   end
   should 'filter html from economic_activity organization' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     value = "name <strong id='name_html_test'>with</strong> html"
     post :edit, :profile => org.identifier, :profile_data => { :economic_activity => value }
     assert_sanitized assigns(:profile).economic_activity
   end
   should 'filter html from management_information organization' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     value = "name <strong id='name_html_test'>with</strong> html"
     post :edit, :profile => org.identifier, :profile_data => { :management_information => value }
     assert_sanitized assigns(:profile).management_information
   end
   should 'saving profile organization_info' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     post :edit, :profile => 'testorg', :profile_data => { :contact_person => 'contact person' }
     assert_equal 'contact person', Organization.find(org.id).contact_person
   end
-  should 'show contact_person field on edit organization' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+  should 'show contact_phone field on edit enterprise' do
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
+    Enterprise.any_instance.expects(:active_fields).returns(['contact_phone']).at_least_once
     get :edit, :profile => org.identifier
-    assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_person]' }
+    assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_phone]' }
   end
   should 'save community description' do
-    org = Community.create!(:name => 'test org', :identifier => 'testorg')
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     post :edit, :profile => 'testorg', :profile_data => { :description => 'my description' }
     assert_equal 'my description', Organization.find(org.id).description
   end
   should 'show community description' do
-    org = Community.create!(:name => 'test org', :identifier => 'testorg')
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
+    Community.any_instance.expects(:active_fields).returns(['description']).at_least_once
     get :edit, :profile => 'testorg'
     assert_tag :tag => 'textarea', :attributes => { :name => 'profile_data[description]' }
   end
-  should 'not show organization description' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+  should 'not show enterprise description' do
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     get :edit, :profile => 'testorg'
     assert_no_tag :tag => 'textarea', :attributes => { :name => 'profile_data[description]' }
   end
@@ -176,13 +178,23 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   end
   should 'save enterprise contact_person' do
-    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg')
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     post :edit, :profile => 'testorg', :profile_data => { :contact_person => 'my contact' }
     assert_equal 'my contact', Enterprise.find(org.id).contact_person
   end
-  should 'show field values on edit organization info' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+  should 'show field values on edit community info' do
+    Community.any_instance.expects(:active_fields).returns(['contact_person']).at_least_once
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
+    org.contact_person = 'my contact'
+    org.save!
+    get :edit, :profile => 'testorg'
+    assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_person]', :value => 'my contact' }
+  end
+
+  should 'show field values on edit enterprise info' do
+    Enterprise.any_instance.expects(:active_fields).returns(['contact_person']).at_least_once
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     org.contact_person = 'my contact'
     org.save!
     get :edit, :profile => 'testorg'
@@ -214,20 +226,27 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   end
   should 'show error messages for invalid foundation_year' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg')
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :environment => Environment.default)
     post :edit, :profile => 'testorg', :profile_data => { :foundation_year => 'aaa' }
     assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' }
   end
   should 'edit enterprise' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent')
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :environment => Environment.default)
     get :edit, :profile => 'testent'
     assert_response :success
   end
-  should 'back when update organization info fail' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact')
-    Organization.any_instance.stubs(:update_attributes).returns(false)
+  should 'back when update community info fail' do
+    org = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
+    Community.any_instance.stubs(:update_attributes).returns(false)
+    post :edit, :profile => 'testorg'
+    assert_template 'edit'
+  end
+
+  should 'back when update enterprise info fail' do
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
+    Enterprise.any_instance.stubs(:update_attributes).returns(false)
     post :edit, :profile => 'testorg'
     assert_template 'edit'
   end
@@ -259,9 +278,22 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   end
   should 'render person partial' do
+    person = create_user('test_profile', :environment => Environment.default).person
+    Person.any_instance.expects(:active_fields).returns(['contact_phone', 'birth_date', 'address']).at_least_once
+    get :edit, :profile => person.identifier
+    person.active_fields.each do |field|
+      assert_tag :tag => 'input', :attributes => { :name => "profile_data[#{field}]" }
+    end
+  end
+
+  should 'display only active person fields' do
+    Person.any_instance.expects(:active_fields).returns(['cell_phone']).at_least_once
     person = create_user('test_profile').person
+
     get :edit, :profile => person.identifier
-    assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_phone]' }
+
+    assert_tag :tag => 'input', :attributes => { :name => "profile_data[cell_phone]" }
+    assert_no_tag :tag => 'input', :attributes => { :name => "profile_data[comercial_phone]" }
   end
   should 'be able to upload an image' do
@@ -271,8 +303,16 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert_not_nil assigns(:profile).image
   end
+  should 'display closed attribute for enterprise when it is set' do
+    org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => true, :environment => Environment.default)
+    get :edit, :profile => 'testorg'
+
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true', :checked => 'checked' }
+    assert_no_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'false', :checked =>  'checked' }
+  end
+
   should 'display closed attribute for organizations when it is set' do
-    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => true)
+    org = Organization.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :closed => true, :environment => Environment.default)
     get :edit, :profile => 'testorg'
     assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[closed]', :value => 'true', :checked => 'checked' }
@@ -311,7 +351,7 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   should 'display manage members options if has permission' do
     profile = Profile['ze']
-    community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact')
+    community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
     @controller.stubs(:user).returns(profile)
     @controller.stubs(:profile).returns(community)
     profile.stubs(:has_permission?).returns(true)
@@ -321,7 +361,7 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   should 'not display manage members options if has no permission' do
     profile = Profile['ze']
-    community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact')
+    community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
     @controller.stubs(:user).returns(profile)
     @controller.stubs(:profile).returns(community)
     profile.stubs(:has_permission?).returns(false)
@@ -329,6 +369,24 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :content => 'Manage Members'
   end
+  should 'render enterprise partial' do
+    ent = Enterprise.create(:name => 'test_profile', :identifier => 'testorg', :environment => Environment.default)
+    Enterprise.any_instance.expects(:active_fields).returns(['contact_phone', 'contact_person', 'contact_email']).at_least_once
+    get :edit, :profile => ent.identifier
+    ent.active_fields.each do |field|
+      assert_tag :tag => 'input', :attributes => { :name => "profile_data[#{field}]" }
+    end
+  end
+
+  should 'render community partial' do
+    community = Community.create(:name => 'test_profile', :identifier => 'testorg', :environment => Environment.default)
+    Community.any_instance.expects(:active_fields).returns(['contact_person', 'language']).at_least_once
+    get :edit, :profile => community.identifier
+    community.active_fields.each do |field|
+      assert_tag :tag => 'input', :attributes => { :name => "profile_data[#{field}]" }
+    end
+  end
+
   should 'show task if user has permission' do
     user1 = create_user('userone').person
     user2 = create_user('usertwo').person
@@ -385,13 +443,13 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   end
   should 'link to enable enterprise' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false, :environment => Environment.default)
     get :index, :profile => 'testent'
     assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testent/profile_editor/enable' }
   end
   should 'link to disable enterprise' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => true)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => true, :environment => Environment.default)
     get :index, :profile => 'testent'
     assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testent/profile_editor/disable' }
   end
@@ -403,31 +461,31 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   end
   should 'request enable enterprise confirmation' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false, :environment => Environment.default)
     get :enable, :profile => 'testent'
     assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testent/profile_editor/enable', :method => 'post' }
   end
   should 'enable enterprise after confirmation' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false, :environment => Environment.default)
     post :enable, :profile => 'testent', :confirmation => 1
     assert assigns(:to_enable).enabled?
   end
   should 'not enable enterprise without confirmation' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => false, :environment => Environment.default)
     post :enable, :profile => 'testent'
     assert !assigns(:to_enable).enabled?
   end
   should 'disable enterprise after confirmation' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => true)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => true, :environment => Environment.default)
     post :disable, :profile => 'testent', :confirmation => 1
     assert !assigns(:to_disable).enabled?
   end
   should 'not disable enterprise without confirmation' do
-    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => true)
+    ent = Enterprise.create!(:name => 'test org', :identifier => 'testent', :enabled => true, :environment => Environment.default)
     post :disable, :profile => 'testent'
     assert assigns(:to_disable).enabled?
   end
@@ -231,6 +231,38 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_tag_in_string meta_tags_for_article(b), :tag => 'link', :attributes => {:type => 'application/rss+xml', :title => 'feed'}
   end
+  should 'provide sex icon for males' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'male').returns('MALE!!')
+    expects(:content_tag).with(anything, 'MALE!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(Person.new(:sex => 'male'))
+  end
+
+  should 'provide sex icon for females' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'female').returns('FEMALE!!')
+    expects(:content_tag).with(anything, 'FEMALE!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(Person.new(:sex => 'female'))
+  end
+
+  should 'provide undef sex icon' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'undef').returns('UNDEF!!')
+    expects(:content_tag).with(anything, 'UNDEF!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(Person.new(:sex => nil))
+  end
+
+  should 'not draw sex icon for non-person profiles' do
+    assert_equal '', profile_sex_icon(Community.new)
+  end
+
+  should 'not draw sex icon when disabled in the environment' do
+    env = Environment.create!(:name => 'env test')
+    env.expects(:enabled?).with('disable_gender_icon').returns(true)
+    stubs(:environment).returns(env)
+    assert_equal '', profile_sex_icon(Person.new(:sex => 'male'))
+  end
+
   protected
   def url_for(args = {})
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CategoriesHelperTest < Test::Unit::TestCase
+
+  include CategoriesHelper
+
+  def setup
+    @environment = Environment.default
+  end
+  attr_reader :environment
+  def _(s); s; end
+
+  should 'generate list of category types for selection' do
+    environment.category_types = ['Category', 'ProductCategory', 'Region']
+    expects(:params).returns({'fieldname' => 'fieldvalue'})
+    expects(:options_for_select).with([['General Category', 'Category'],[ 'Product Category', 'ProductCategory'],[ 'Region', 'Region' ]], 'fieldvalue').returns('OPTIONS')
+    expects(:select_tag).with('type', 'OPTIONS').returns('TAG')
+    expects(:labelled_form_field).with(anything, 'TAG').returns('RESULT')
+    
+    assert_equal 'RESULT', select_category_type('fieldname')
+  end
+
+  should 'only list the available types' do
+    environment.category_types = ['Category']
+    expects(:params).returns({'fieldname' => 'fieldvalue'})
+    expects(:options_for_select).with([['General Category', 'Category']], 'fieldvalue').returns('OPTIONS')
+    expects(:select_tag).with('type', 'OPTIONS').returns('TAG')
+    expects(:labelled_form_field).with(anything, 'TAG').returns('RESULT')
+    
+    assert_equal 'RESULT', select_category_type('fieldname')
+  end
+
+end
@@ -7,19 +7,19 @@ class CommunityTest &lt; Test::Unit::TestCase
   end
   should 'convert name into identifier' do
-    c = Community.new(:name =>'My shiny new Community')
+    c = Community.new(:environment => Environment.default, :name =>'My shiny new Community')
     assert_equal 'My shiny new Community', c.name
     assert_equal 'my-shiny-new-community', c.identifier
   end
   should 'have a description attribute' do
-    c = Community.new
+    c = Community.new(:environment => Environment.default)
     c.description = 'the description of the community'
     assert_equal 'the description of the community', c.description
   end
   should 'create default set of blocks' do
-    c = Community.create!(:name => 'my new community')
+    c = Community.create!(:environment => Environment.default, :name => 'my new community')
     assert c.boxes[0].blocks.map(&:class).include?(MainBlock)
@@ -33,19 +33,19 @@ class CommunityTest &lt; Test::Unit::TestCase
   end
   should 'get a default home page and RSS feed' do
-    community = Community.create!(:name => 'my new community')
+    community = Community.create!(:environment => Environment.default, :name => 'my new community')
     assert_kind_of Article, community.home_page
     assert_kind_of RssFeed, community.articles.find_by_path('feed')
   end
   should 'have contact_person' do
-    community = Community.new(:name => 'my new community')
+    community = Community.new(:environment => Environment.default, :name => 'my new community')
     assert_respond_to community, :contact_person
   end
   should 'allow to add new members' do
-    c = Community.create!(:name => 'my test profile', :identifier => 'mytestprofile')
+    c = Community.create!(:environment => Environment.default, :name => 'my test profile', :identifier => 'mytestprofile')
     p = create_user('mytestuser').person
     c.add_member(p)
@@ -54,7 +54,7 @@ class CommunityTest &lt; Test::Unit::TestCase
   end
   should 'allow to remove members' do
-    c = Community.create!(:name => 'my other test profile', :identifier => 'myothertestprofile')
+    c = Community.create!(:environment => Environment.default, :name => 'my other test profile', :identifier => 'myothertestprofile')
     p = create_user('myothertestuser').person
     c.add_member(p)
@@ -65,7 +65,7 @@ class CommunityTest &lt; Test::Unit::TestCase
   end
   should 'clear relationships after destroy' do
-    c = Community.create!(:name => 'my test profile', :identifier => 'mytestprofile')
+    c = Community.create!(:environment => Environment.default, :name => 'my test profile', :identifier => 'mytestprofile')
     member = create_user('memberuser').person
     admin = create_user('adminuser').person
     moderator = create_user('moderatoruser').person
@@ -85,8 +85,36 @@ class CommunityTest &lt; Test::Unit::TestCase
   should 'have a community template' do
     env = Environment.create!(:name => 'test env')
-    p = Community.create!(:name => 'test_com', :identifier => 'test_com', :environment => env)
+    p = Community.create!(:environment => Environment.default, :name => 'test_com', :identifier => 'test_com', :environment => env)
     assert_kind_of Community, p.template
   end
+  should 'return active_community_fields' do
+    e = Environment.default
+    e.expects(:active_community_fields).returns(['contact_phone', 'contact_email']).at_least_once
+    ent = Community.new(:environment => e)
+
+    assert_equal e.active_community_fields, ent.active_fields
+  end
+
+  should 'return required_community_fields' do
+    e = Environment.default
+    e.expects(:required_community_fields).returns(['contact_phone', 'contact_email']).at_least_once
+    community = Community.new(:environment => e)
+
+    assert_equal e.required_community_fields, community.required_fields
+  end
+
+  should 'require fields if community needs' do
+    e = Environment.default
+    e.expects(:required_community_fields).returns(['contact_phone']).at_least_once
+    community = Community.new(:environment => e)
+    assert ! community.valid?
+    assert community.errors.invalid?(:contact_phone)
+
+    community.contact_phone = '99999'
+    community.valid?
+    assert ! community.errors.invalid?(:contact_phone)
+  end
+
 end
@@ -174,7 +174,7 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     ent.reload
     assert_equal 1, ent.boxes.size
     assert_equal 1, ent.boxes[0].blocks.size
-  end
+   end
    should 'not replace template if environment doesnt allow' do
     template = Enterprise.create!(:name => 'template enteprise', :identifier => 'template_enterprise', :enabled => false)
@@ -195,7 +195,8 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     assert_equal 1, ent.boxes.size
     assert_equal 1, ent.boxes[0].blocks.size
   end
- should 'create EnterpriseActivation task when creating with enabled = false' do
+
+  should 'create EnterpriseActivation task when creating with enabled = false' do
     EnterpriseActivation.delete_all
     ent = Enterprise.create!(:name => 'test enteprise', :identifier => 'test_ent', :enabled => false)
     assert_equal [ent], EnterpriseActivation.find(:all).map(&:enterprise)
@@ -256,4 +257,32 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     assert e.enable_contact_us
   end
+  should 'return active_enterprise_fields' do
+    e = Environment.default
+    e.expects(:active_enterprise_fields).returns(['contact_phone', 'contact_email']).at_least_once
+    ent = Enterprise.new(:environment => e)
+
+    assert_equal e.active_enterprise_fields, ent.active_fields
+  end
+
+  should 'return required_enterprise_fields' do
+    e = Environment.default
+    e.expects(:required_enterprise_fields).returns(['contact_phone', 'contact_email']).at_least_once
+    enterprise = Enterprise.new(:environment => e)
+
+    assert_equal e.required_enterprise_fields, enterprise.required_fields
+  end
+
+  should 'require fields if enterprise needs' do
+    e = Environment.default
+    e.expects(:required_enterprise_fields).returns(['contact_phone']).at_least_once
+    enterprise = Enterprise.new(:environment => e)
+    assert ! enterprise.valid?
+    assert enterprise.errors.invalid?(:contact_phone)
+
+    enterprise.contact_phone = '99999'
+    enterprise.valid?
+    assert ! enterprise.errors.invalid?(:contact_phone)
+  end
+
 end
@@ -532,4 +532,153 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal false, Environment.new.replace_enterprise_template_when_enable
   end
+  should 'set custom_person_fields' do
+    env = Environment.new
+    env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => 'true'},'comercial_phone'=>  {'required' => 'true', 'active' => 'true'}}
+
+    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true'},'comercial_phone'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+  end
+
+  should 'have no custom_person_fields by default' do
+    assert_equal({}, Environment.new.custom_person_fields)
+  end
+
+  should 'not set in custom_person_fields if not in person.fields' do
+    env = Environment.default
+    Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
+
+    env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}}
+    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert ! env.custom_person_fields.keys.include?('birth_date')
+  end
+
+  should 'add schooling_status if custom_person_fields has schooling' do
+    env = Environment.default
+    Person.stubs(:fields).returns(['cell_phone', 'schooling'])
+
+    env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}}
+    assert_equal({'schooling' => {'required' => 'true', 'active' => 'true'}, 'schooling_status' => {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert ! env.custom_person_fields.keys.include?('birth_date')
+  end
+
+  should 'return person_fields status' do
+    env = Environment.default
+
+    env.expects(:custom_person_fields).returns({ 'birth_date' => {'required' => 'true', 'active' => 'false'}}).at_least_once
+
+    assert_equal true, env.custom_person_field('birth_date', 'required')
+    assert_equal false, env.custom_person_field('birth_date', 'active')
+  end
+
+  should 'select active fields from person' do
+    env = Environment.default
+    env.expects(:custom_person_fields).returns({ 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'false'}}).at_least_once
+
+    assert_equal ['birth_date'], env.active_person_fields
+  end
+
+  should 'select required fields from person' do
+    env = Environment.default
+    env.expects(:custom_person_fields).returns({ 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'false', 'active' => 'true'}}).at_least_once
+
+    assert_equal ['birth_date'], env.required_person_fields
+  end
+
+  should 'set custom_enterprises_fields' do
+    env = Environment.new
+    env.custom_enterprise_fields = {'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}
+
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
+  end
+
+  should 'have no custom_enterprise_fields by default' do
+    assert_equal({}, Environment.new.custom_enterprise_fields)
+  end
+
+  should 'not set in custom_enterprise_fields if not in enterprise.fields' do
+    env = Environment.default
+    Enterprise.stubs(:fields).returns(['contact_person', 'comercial_phone'])
+
+    env.custom_enterprise_fields = { 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'true'}}
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
+    assert ! env.custom_enterprise_fields.keys.include?('contact_email')
+  end
+
+  should 'return enteprise_fields status' do
+    env = Environment.default
+
+    env.expects(:custom_enterprise_fields).returns({ 'contact_email' => {'required' => 'true', 'active' => 'false'}}).at_least_once
+
+    assert_equal true, env.custom_enterprise_field('contact_email', 'required')
+    assert_equal false, env.custom_enterprise_field('contact_email', 'active')
+  end
+
+  should 'select active fields from enterprise' do
+    env = Environment.default
+    env.expects(:custom_enterprise_fields).returns({ 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'false'}}).at_least_once
+
+    assert_equal ['contact_email'], env.active_enterprise_fields
+  end
+
+  should 'select required fields from enterprise' do
+    env = Environment.default
+    env.expects(:custom_enterprise_fields).returns({ 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'false', 'active' => 'true'}}).at_least_once
+
+    assert_equal ['contact_email'], env.required_enterprise_fields
+  end
+
+  should 'set custom_communitys_fields' do
+    env = Environment.new
+    env.custom_community_fields = {'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}
+
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_community_fields)
+  end
+
+  should 'have no custom_community_fields by default' do
+    assert_equal({}, Environment.new.custom_community_fields)
+  end
+
+  should 'not set in custom_community_fields if not in community.fields' do
+    env = Environment.default
+    Community.stubs(:fields).returns(['contact_person', 'comercial_phone'])
+
+    env.custom_community_fields = { 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'true'}}
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'}}, env.custom_community_fields)
+    assert ! env.custom_community_fields.keys.include?('contact_email')
+  end
+
+  should 'return community_fields status' do
+    env = Environment.default
+
+    env.expects(:custom_community_fields).returns({ 'contact_email' => {'required' => 'true', 'active' => 'false'}}).at_least_once
+
+    assert_equal true, env.custom_community_field('contact_email', 'required')
+    assert_equal false, env.custom_community_field('contact_email', 'active')
+  end
+
+  should 'select active fields from community' do
+    env = Environment.default
+    env.expects(:custom_community_fields).returns({ 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'false'}}).at_least_once
+
+    assert_equal ['contact_email'], env.active_community_fields
+  end
+
+  should 'select required fields from community' do
+    env = Environment.default
+    env.expects(:custom_community_fields).returns({ 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'false', 'active' => 'true'}}).at_least_once
+
+    assert_equal ['contact_email'], env.required_community_fields
+  end
+
+  should 'set category_types' do
+    env = Environment.new
+    env.category_types = ['Category', 'ProductCategory']
+
+    assert_equal ['Category', 'ProductCategory'], env.category_types
+  end
+
+  should 'have type /Category/ on category_types by default' do
+    assert_equal ['Category'], Environment.new.category_types
+  end
+
 end
@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class FriendshipTest < Test::Unit::TestCase
   should 'connect a person to another' do
-    p1 = Person.new
-    p2 = Person.new
+    p1 = Person.new(:environment => Environment.default)
+    p2 = Person.new(:environment => Environment.default)
     f = Friendship.new
     assert_raise ActiveRecord::AssociationTypeMismatch do
@@ -4,7 +4,7 @@ class PersonTest &lt; Test::Unit::TestCase
   fixtures :profiles, :users, :environments
   def test_person_must_come_form_the_cration_of_an_user
-    p = Person.new(:name => 'John', :identifier => 'john')
+    p = Person.new(:environment => Environment.default, :name => 'John', :identifier => 'john')
     assert !p.valid?
     p.user =  create_user('john', :email => 'john@doe.org', :password => 'dhoe', :password_confirmation => 'dhoe')
     assert !p.valid?
@@ -59,21 +59,21 @@ class PersonTest &lt; Test::Unit::TestCase
     p1 = u.person
     assert_equal u, p1.user
-    p2 = Person.new
+    p2 = Person.new(:environment => Environment.default)
     p2.user = u
     assert !p2.valid?
     assert p2.errors.invalid?(:user_id)
   end
   should "have person info fields" do
-    p = Person.new
+    p = Person.new(:environment => Environment.default)
     [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code ].each do |i|
       assert_respond_to p, i
     end
   end
   should 'not have person_info class' do
-    p = Person.new
+    p = Person.new(:environment => Environment.default)
     assert_raise NoMethodError do
       p.person_info
     end
@@ -108,7 +108,7 @@ class PersonTest &lt; Test::Unit::TestCase
   end
   should 'get no email address when there is no associated user' do
-    p = Person.new
+    p = Person.new(:environment => Environment.default)
     assert_nil p.email
   end
@@ -173,12 +173,12 @@ class PersonTest &lt; Test::Unit::TestCase
   end
   should 'suggest default friend groups list' do
-    p = Person.new
+    p = Person.new(:environment => Environment.default)
     assert_equivalent [ 'friends', 'work', 'school', 'family' ], p.suggested_friend_groups
   end
   should 'suggest current groups as well' do
-    p = Person.new
+    p = Person.new(:environment => Environment.default)
     p.expects(:friend_groups).returns(['group1', 'group2'])
     assert_equivalent [ 'friends', 'work', 'school', 'family', 'group1', 'group2' ], p.suggested_friend_groups
   end
@@ -264,14 +264,14 @@ class PersonTest &lt; Test::Unit::TestCase
   end
   should 'provide desired info fields' do 
-    p = Person.new
+    p = Person.new(:environment => Environment.default)
     assert p.respond_to?(:photo)
     assert p.respond_to?(:address)
     assert p.respond_to?(:contact_information)
   end
   should 'required name' do
-    person = Person.new
+    person = Person.new(:environment => Environment.default)
     assert !person.valid?
     assert person.errors.invalid?(:name)
   end
@@ -285,7 +285,7 @@ class PersonTest &lt; Test::Unit::TestCase
   should 'have e-mail addresses' do
     env = Environment.create!(:name => 'sample env', :domains => [Domain.new(:name => 'somedomain.com')])
-    person = Person.new(:identifier => 'testuser')
+    person = Person.new(:environment => env, :identifier => 'testuser')
     person.expects(:environment).returns(env)
     assert_equal ['testuser@somedomain.com'], person.email_addresses
@@ -295,7 +295,7 @@ class PersonTest &lt; Test::Unit::TestCase
     env = Environment.create!(:name => 'sample env', :domains => [Domain.new(:name => 'somedomain.com')])
     env.force_www = true
     env.save
-    person = Person.new(:identifier => 'testuser')
+    person = Person.new(:environment => env, :identifier => 'testuser')
     person.expects(:environment).returns(env)
     assert_equal ['testuser@somedomain.com'], person.email_addresses
@@ -387,4 +387,76 @@ class PersonTest &lt; Test::Unit::TestCase
     assert_equal 'pt_BR', Person['user_lang_test'].last_lang
   end
+  should 'return active_person_fields' do
+    e = Environment.default
+    e.expects(:active_person_fields).returns(['cell_phone', 'comercial_phone']).at_least_once
+    person = Person.new(:environment => e)
+
+    assert_equal e.active_person_fields, person.active_fields
+  end
+
+  should 'return required_person_fields' do
+    e = Environment.default
+    e.expects(:required_person_fields).returns(['cell_phone', 'comercial_phone']).at_least_once
+    person = Person.new(:environment => e)
+
+    assert_equal e.required_person_fields, person.required_fields
+  end
+
+  should 'require fields if person needs' do
+    e = Environment.default
+    e.expects(:required_person_fields).returns(['cell_phone']).at_least_once
+    person = Person.new(:environment => e)
+    assert ! person.valid?
+    assert person.errors.invalid?(:cell_phone)
+
+    person.cell_phone = '99999'
+    person.valid?
+    assert ! person.errors.invalid?(:cell_phone)
+  end
+
+  should 'require custom_area_of_study if area_of_study is others' do
+    e = Environment.default
+    e.expects(:required_person_fields).returns(['area_of_study', 'custom_area_of_study']).at_least_once
+  
+    person = Person.new(:environment => e, :area_of_study => 'Others')
+    assert !person.valid?
+    assert person.errors.invalid?(:custom_area_of_study)
+
+    person.custom_area_of_study = 'Customized area of study'
+    person.valid?
+    assert ! person.errors.invalid?(:custom_area_of_study)
+  end
+
+  should 'not require custom_area_of_study if area_of_study is not others' do
+    e = Environment.default
+    e.expects(:required_person_fields).returns(['area_of_study']).at_least_once
+
+    person = Person.new(:environment => e, :area_of_study => 'Agrometeorology')
+    person.valid?
+    assert ! person.errors.invalid?(:custom_area_of_study)
+  end
+
+  should 'require custom_formation if formation is others' do
+    e = Environment.default
+    e.expects(:required_person_fields).returns(['formation', 'custom_formation']).at_least_once
+
+    person = Person.new(:environment => e, :formation => 'Others')
+    assert !person.valid?
+    assert person.errors.invalid?(:custom_formation)
+
+    person.custom_formation = 'Customized formation'
+    person.valid?
+    assert ! person.errors.invalid?(:custom_formation)
+  end
+
+  should 'not require custom_formation if formation is not others' do
+    e = Environment.default
+    e.expects(:required_person_fields).returns(['formation']).at_least_once
+ 
+    person = Person.new(:environment => e, :formation => 'Agrometeorology')
+    assert !person.valid?
+    assert ! person.errors.invalid?(:custom_formation)
+  end
+
 end
	@@ -15,4 +15,40 @@ class FeaturesController < AdminController		@@ -15,4 +15,40 @@ class FeaturesController < AdminController
15	end	15	end
16	end	16	end
17		17
		18	+ def manage_fields
		19	+ @person_fields = Person.fields
		20	+ @enterprise_fields = Enterprise.fields
		21	+ @community_fields = Community.fields
		22	+ end
		23	+
		24	+ def manage_person_fields
		25	+ environment.custom_person_fields = params[:person_fields]
		26	+ if environment.save!
		27	+ flash[:notice] = _('Custom person fields updated successfully.')
		28	+ else
		29	+ flash[:error] = _('Custom person fields not updated successfully.')
		30	+ end
		31	+ redirect_to :action => 'manage_fields'
		32	+ end
		33	+
		34	+ def manage_enterprise_fields
		35	+ environment.custom_enterprise_fields = params[:enterprise_fields]
		36	+ if environment.save!
		37	+ flash[:notice] = _('Custom enterprise fields updated successfully.')
		38	+ else
		39	+ flash[:error] = _('Custom enterprise fields not updated successfully.')
		40	+ end
		41	+ redirect_to :action => 'manage_fields'
		42	+ end
		43	+
		44	+ def manage_community_fields
		45	+ environment.custom_community_fields = params[:community_fields]
		46	+ if environment.save!
		47	+ flash[:notice] = _('Custom community fields updated successfully.')
		48	+ else
		49	+ flash[:error] = _('Custom community fields not updated successfully.')
		50	+ end
		51	+ redirect_to :action => 'manage_fields'
		52	+ end
		53	+
18	end	54	end
	@@ -35,7 +35,8 @@ module CategoriesHelper		@@ -35,7 +35,8 @@ module CategoriesHelper
35		35
36	def select_category_type(field)	36	def select_category_type(field)
37	value = params[field]	37	value = params[field]
38	- labelled_form_field(_('Type of category'), select_tag('type', options_for_select(CategoriesHelper::TYPES, value)))	38	+ types = TYPES.select { \|title,typename\| environment.category_types.include?(typename) }
		39	+ labelled_form_field(_('Type of category'), select_tag('type', options_for_select(types, value)))
39	end	40	end
40		41
41	end	42	end
@@ -0,0 +1,362 @@		@@ -0,0 +1,362 @@
	1	+module ProfileEditorHelper
	2	+
	3	+ include GetText
	4	+
	5	+ AREAS_OF_STUDY = [
	6	+ N_('Agrometeorology'),
	7	+ N_('Agronomy'),
	8	+ N_('Foods'),
	9	+ N_('Anthropology'),
	10	+ N_('Architecture'),
	11	+ N_('Arts'),
	12	+ N_('Astronomy'),
	13	+ N_('Librarianship'),
	14	+ N_('Biosciences'),
	15	+ N_('Biophysics'),
	16	+ N_('Biology'),
	17	+ N_('Biotechnology'),
	18	+ N_('Botany'),
	19	+ N_('Science Politics'),
	20	+ N_('Accounting and Actuarial Science'),
	21	+ N_('Morphologic Sciences'),
	22	+ N_('Computation'),
	23	+ N_('Rural Development'),
	24	+ N_('Law'),
	25	+ N_('Ecology'),
	26	+ N_('Economy'),
	27	+ N_('Education'),
	28	+ N_('Long-distance Education'),
	29	+ N_('Physical Education'),
	30	+ N_('Professional Education'),
	31	+ N_('Nursing'),
	32	+ N_('Engineerings'),
	33	+ N_('Basic and Average education'),
	34	+ N_('Statistics'),
	35	+ N_('Stratigraphy'),
	36	+ N_('Pharmacy'),
	37	+ N_('Pharmacology'),
	38	+ N_('Philosophy'),
	39	+ N_('Physics'),
	40	+ N_('Plant Protection'),
	41	+ N_('Genetics'),
	42	+ N_('Geosciences'),
	43	+ N_('Geography'),
	44	+ N_('Geology'),
	45	+ N_('Hydrology'),
	46	+ N_('Hydromechanics'),
	47	+ N_('History'),
	48	+ N_('Horticulture'),
	49	+ N_('Informatics'),
	50	+ N_('Interdisciplinary'),
	51	+ N_('Journalism'),
	52	+ N_('Letters'),
	53	+ N_('Languages'),
	54	+ N_('Mathematics'),
	55	+ N_('Medicines'),
	56	+ N_('Medicine'),
	57	+ N_('Metallurgy'),
	58	+ N_('Microbiology'),
	59	+ N_('Mineralogy'),
	60	+ N_('Music'),
	61	+ N_('Nutrition'),
	62	+ N_('Odontology'),
	63	+ N_('Paleontology'),
	64	+ N_('Petrology'),
	65	+ N_('Production'),
	66	+ N_('Psychology'),
	67	+ N_('Psychiatry'),
	68	+ N_('Quality'),
	69	+ N_('Chemistry'),
	70	+ N_('Health'),
	71	+ N_('Remote Sensing'),
	72	+ N_('Forestry'),
	73	+ N_('Sociology'),
	74	+ N_('Ground'),
	75	+ N_('Theater'),
	76	+ N_('Transport'),
	77	+ N_('Urbanism'),
	78	+ N_('Veterinary Medicine'),
	79	+ N_('Zoology'),
	80	+ N_('Zootecnia'),
	81	+ N_('Others')
	82	+ ]
	83	+
	84	+ COUNTRIES = [
	85	+ ("Afeganistão (افغانستان)"),
	86	+ ("África do Sul (South Africa)"),
	87	+ ("Albânia (Shqipëria)"),
	88	+ ("Alemanha (Deutschland)"),
	89	+ ("Andorra"),
	90	+ ("Angola"),
	91	+ ("Anguila (Anguilla)"),
	92	+ ("Antártica (Antarctica)"),
	93	+ ("Antígua e Barbuda (Antigua and Barbuda)"),
	94	+ ("Antilhas Holandesas (Netherlands Antilles)"),
	95	+ ("Arábia Saudita (العربية السعودية)"),
	96	+ ("Argélia (الجمهورية الجزائرية)"),
	97	+ ("Argentina"),
	98	+ ("Armênia (Հայաստան)"),
	99	+ ("Aruba"),
	100	+ ("Austrália (Australia)"),
	101	+ ("Áustria (Österreich)"),
	102	+ ("Azerbaijão (Azərbaycan)"),
	103	+ ("Bahamas"),
	104	+ ("Bangladesh (বাংলাদেশ)"),
	105	+ ("Barbados"),
	106	+ ("Barein (بحرين)"),
	107	+ ("Bélgica (België)"),
	108	+ ("Belize"),
	109	+ ("Benin (Bénin)"),
	110	+ ("Bermudas (Bermuda)"),
	111	+ ("Bielo-Rússia (Белару́сь)"),
	112	+ ("Bolívia (Bolivia)"),
	113	+ ("Bósnia-Herzegovina (Bosna i Hercegovina)"),
	114	+ ("Botsuana (Botswana)"),
	115	+ ("Brasil"),
	116	+ ("Brunei (Brunei Darussalam)"),
	117	+ ("Bulgária (България)"),
	118	+ ("Burkina Fasso (Burkina Faso)"),
	119	+ ("Burundi (Uburundi)"),
	120	+ ("Butão (འབྲུག་ཡུལ)"),
	121	+ ("Cabo Verde"),
	122	+ ("Camarões (Cameroun)"),
	123	+ ("Camboja (Kampuchea)"),
	124	+ ("Canadá (Canada)"),
	125	+ ("Catar (قطر)"),
	126	+ ("Cazaquistão (Қазақстан)"),
	127	+ ("Chade (Tchad)"),
	128	+ ("Chile"),
	129	+ ("China (中国)"),
	130	+ ("Chipre (Κυπρος)"),
	131	+ ("Cidade do Vaticano (Città del Vaticano)"),
	132	+ ("Cingapura (Singapura)"),
	133	+ ("Colômbia (Colombia)"),
	134	+ ("Comores"),
	135	+ ("Congo"),
	136	+ ("Congo, República democrática do (Congo, Democratic Republic of the)"),
	137	+ ("Coréia do Norte (조선)"),
	138	+ ("Coréia do Sul (한국)"),
	139	+ ("Costa do Marfim (Côte d'Ivoire)"),
	140	+ ("Costa Rica"),
	141	+ ("Croácia (Hrvatska)"),
	142	+ ("Cuba"),
	143	+ ("Dinamarca (Danmark)"),
	144	+ ("Djibuti (Djibouti)"),
	145	+ ("Dominica"),
	146	+ ("Egito (مصر)"),
	147	+ ("El Salvador"),
	148	+ ("Emirados Árabes Unidos (الإمارات العربيّة المتّحد)"),
	149	+ ("Equador (Ecuador)"),
	150	+ ("Eritréia (Ertra)"),
	151	+ ("Eslováquia (Slovensko)"),
	152	+ ("Eslovênia (Slovenija)"),
	153	+ ("Espanha (España)"),
	154	+ ("Estados Unidos (United States)"),
	155	+ ("Estônia (Eesti)"),
	156	+ ("Etiópia (Ityop'iya)"),
	157	+ ("Fiji"),
	158	+ ("Filipinas (Pilipinas)"),
	159	+ ("Finlândia (Suomi)"),
	160	+ ("França (France)"),
	161	+ ("Gabão (Gabon)"),
	162	+ ("Gâmbia (Gambia)"),
	163	+ ("Gana (Ghana)"),
	164	+ ("Geórgia (საქართველო)"),
	165	+ ("Geórgia do Sul e Ilhas Sandwich do Sul (South Georgia and the South Sandwich Islands)"),
	166	+ ("Gibraltar"),
	167	+ ("Granada (Grenada)"),
	168	+ ("Grécia (Eλλας)"),
	169	+ ("Groenlândia (Greenland)"),
	170	+ ("Guadalupe (Guadeloupe)"),
	171	+ ("Guam"),
	172	+ ("Guatemala"),
	173	+ ("Guernsey"),
	174	+ ("Guiana (Guyana)"),
	175	+ ("Guiana Francesa (French Guiana)"),
	176	+ ("Guiné (Guinée)"),
	177	+ ("Guiné-Bissau"),
	178	+ ("Guiné Equatorial (Guinea Ecuatorial)"),
	179	+ ("Haiti (Haïti)"),
	180	+ ("Holanda (Nederland)"),
	181	+ ("Honduras"),
	182	+ ("Hong Kong"),
	183	+ ("Hungria (Magyarország)"),
	184	+ ("Iêmen (اليمن)"),
	185	+ ("Ilha Aland (Aland Islands)"),
	186	+ ("Ilha Bouvet (Bouvet Island)"),
	187	+ ("Ilha Christmas (Christmas Island)"),
	188	+ ("Ilha de Man (Isle of Man)"),
	189	+ ("Ilha Norfolk (Norfolk Island)"),
	190	+ ("Ilhas Cayman (Cayman Islands)"),
	191	+ ("Ilhas Cocos (Keeling) (Cocos Islands)"),
	192	+ ("Ilhas Cook (Cook Islands)"),
	193	+ ("Ilhas Falkland (Malvinas) (Falkland Islands)"),
	194	+ ("Ilhas Faroé (Faroe Islands)"),
	195	+ ("Ilhas Heard e McDonald (Heard Island and McDonald Islands)"),
	196	+ ("Ilhas Marianas do Norte (Northern Mariana Islands)"),
	197	+ ("Ilhas Marshall (Marshall Islands)"),
	198	+ ("Ilhas Maurício (Mauritius)"),
	199	+ ("Ilhas Reunião (Reunion)"),
	200	+ ("Ilhas Salomão (Solomon Islands)"),
	201	+ ("Ilhas Svalbard e Jan Mayen (Svalbard and Jan Mayen)"),
	202	+ ("Ilhas Tokelau (Tokelau)"),
	203	+ ("Ilhas Turks e Caicos (Turks and Caicos Islands)"),
	204	+ ("Ilhas Virgens, Britânicas (Virgin Islands, British)"),
	205	+ ("Ilhas Virgens, EUA (Virgin Islands, U.S.)"),
	206	+ ("Ilhas Wallis e Futuna (Wallis and Futuna)"),
	207	+ ("Índia (India)"),
	208	+ ("Indonésia (Indonesia)"),
	209	+ ("Irã (ایران)"),
	210	+ ("Iraque (العراق)"),
	211	+ ("Irlanda (Ireland)"),
	212	+ ("Islândia (Ísland)"),
	213	+ ("Israel (ישראל)"),
	214	+ ("Itália (Italia)"),
	215	+ ("Jamaica"),
	216	+ ("Japão (日本)"),
	217	+ ("Jordânia (الارد)"),
	218	+ ("Kiribati"),
	219	+ ("Kuwait (الكويت)"),
	220	+ ("Laos (ນລາວ)"),
	221	+ ("Lesoto (Lesotho)"),
	222	+ ("Letônia (Latvija)"),
	223	+ ("Líbano (لبنان)"),
	224	+ ("Libéria (Liberia)"),
	225	+ ("Líbia (ليبية)"),
	226	+ ("Liechtenstein"),
	227	+ ("Lituânia (Lietuva)"),
	228	+ ("Luxemburgo (Lëtzebuerg)"),
	229	+ ("Macau (Macao)"),
	230	+ ("Macedônia (Македонија)"),
	231	+ ("Madagáscar (Madagasikara)"),
	232	+ ("Maiote (Mayotte)"),
	233	+ ("Malásia (Malaysia)"),
	234	+ ("Malavi (Malawi)"),
	235	+ ("Maldivas (ގުޖޭއްރާ ޔާއްރިހޫމްޖ)"),
	236	+ ("Mali"),
	237	+ ("Malta"),
	238	+ ("Marrocos (مغرب)"),
	239	+ ("Martinica (Martinique)"),
	240	+ ("Mauritânia (موريتانية)"),
	241	+ ("México"),
	242	+ ("Micronésia (Micronesia)"),
	243	+ ("Moçambique"),
	244	+ ("Moldávia (Moldova)"),
	245	+ ("Mônaco (Monaco)"),
	246	+ ("Mongólia (Монгол Улс)"),
	247	+ ("Montserrat"),
	248	+ ("Myanmar (Լեռնային Ղարաբաղ)"),
	249	+ ("Namíbia (Namibia)"),
	250	+ ("Nauru (Naoero)"),
	251	+ ("Nepal (नेपाल)"),
	252	+ ("Nicarágua (Nicaragua)"),
	253	+ ("Níger (Niger)"),
	254	+ ("Nigéria (Nigeria)"),
	255	+ ("Niue"),
	256	+ ("Noruega (Norge)"),
	257	+ ("Nova Caledônia (New Caledonia)"),
	258	+ ("Nova Jérsei (Jersey)"),
	259	+ ("Nova Zelândia (New Zealand)"),
	260	+ ("Omã (عمان)"),
	261	+ ("Palau (Belau)"),
	262	+ ("Palestina (Palestine)"),
	263	+ ("Panamá"),
	264	+ ("Papua-Nova Guiné (Papua New Guinea)"),
	265	+ ("Paquistão (پاکستان)"),
	266	+ ("Paraguai (Paraguay)"),
	267	+ ("Peru (Perú)"),
	268	+ ("Pitcairn"),
	269	+ ("Polinésia Francesa (French Polynesia)"),
	270	+ ("Polônia (Polska)"),
	271	+ ("Porto Rico (Puerto Rico)"),
	272	+ ("Portugal"),
	273	+ ("Quênia (Kenya)"),
	274	+ ("Quirquistão (Кыргызстан)"),
	275	+ ("Reino Unido (United Kingdom)"),
	276	+ ("República Centro-Africana (République Centrafricaine)"),
	277	+ ("República Dominicana (Dominican Republic)"),
	278	+ ("República Tcheca (Česko)"),
	279	+ ("Romênia (România)"),
	280	+ ("Ruanda (Rwanda)"),
	281	+ ("Rússia (Россия)"),
	282	+ ("Saara Ocidental (صحراوية)"),
	283	+ ("Samoa"),
	284	+ ("Samoa Americana (American Samoa)"),
	285	+ ("San Marino"),
	286	+ ("Santa Helena (Saint Helena)"),
	287	+ ("Santa Lúcia (Saint Lucia)"),
	288	+ ("São Cristóvão e Névis (Saint Kitts and Nevis)"),
	289	+ ("São Pierre e Miquelon (Saint Pierre and Miquelon)"),
	290	+ ("São Tomé e Príncipe (São Tomé and Príncipe)"),
	291	+ ("São Vincente e Granadinas (Saint Vincent and the Grenadines)"),
	292	+ ("Seicheles (Seychelles)"),
	293	+ ("Senegal (Sénégal)"),
	294	+ ("Serra Leoa (Sierra Leone)"),
	295	+ ("Sérvia e Montenegro (Србија и Црна Гора)"),
	296	+ ("Síria (سورية)"),
	297	+ ("Somália (Soomaaliya)"),
	298	+ ("Sri Lanka"),
	299	+ ("Suazilândia (Swaziland)"),
	300	+ ("Sudão (السودان)"),
	301	+ ("Suécia (Sverige)"),
	302	+ ("Suíça (Schweiz)"),
	303	+ ("Suriname"),
	304	+ ("Tailândia (ราชอาณาจักรไทย)"),
	305	+ ("Taiwan (台灣)"),
	306	+ ("Tajiquistão (Тоҷикистон)"),
	307	+ ("Tanzânia (Tanzania)"),
	308	+ ("Território Britânico do Oceano Índico (British Indian Ocean Territory)"),
	309	+ ("Territórios Franceses do Sul (French Southern Territories)"),
	310	+ ("Territórios Insulares dos Estados Unidos (United States minor outlying islands)"),
	311	+ ("Timor Leste (Timor-Leste)"),
	312	+ ("Togo"),
	313	+ ("Tonga"),
	314	+ ("Trinidad e Tobago (Trinidad and Tobago)"),
	315	+ ("Tunísia (تونس)"),
	316	+ ("Turcomenistão (Türkmenistan)"),
	317	+ ("Turquia (Türkiye)"),
	318	+ ("Tuvalu"),
	319	+ ("Ucrânia (Україна)"),
	320	+ ("Uganda"),
	321	+ ("Uruguai (Uruguay)"),
	322	+ ("Uzbequistão (O'zbekiston)"),
	323	+ ("Vanuatu"),
	324	+ ("Venezuela"),
	325	+ ("Vietnã (Việt Nam)"),
	326	+ ("Zâmbia (Zambia)"),
	327	+ ("Zimbábue (Zimbabwe)")
	328	+ ]
	329	+
	330	+ SCHOOLING = [
	331	+ N_('Post-Doctoral'),
	332	+ N_('Ph.D.'),
	333	+ N_('Masters'),
	334	+ N_('Undergraduate'),
	335	+ N_('Graduate'),
	336	+ N_('High School'),
	337	+ N_('Elementary School')
	338	+ ]
	339	+
	340	+ SCHOOLING_STATUS = [
	341	+ N_('Concluded'),
	342	+ N_('Incomplete'),
	343	+ N_('Ongoing')
	344	+ ]
	345	+
	346	+ def select_area(title, object, method, options)
	347	+ labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::AREAS_OF_STUDY.map{\|s\| [gettext(s), s]}, {}, options))
	348	+ end
	349	+
	350	+ def select_country(title, object, method, options)
	351	+ labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::COUNTRIES.map{\|s\| [s]}, {}, options))
	352	+ end
	353	+
	354	+ def select_schooling(object, method, options)
	355	+ select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::SCHOOLING.map{\|s\| [gettext(s), s]}, {}, options)
	356	+ end
	357	+
	358	+ def select_schooling_status(object, method, options)
	359	+ select(object, method, [[_('[Select ...]'), nil]] + ProfileEditorHelper::SCHOOLING_STATUS.map{\|s\| [gettext(s), s]}, {}, options)
	360	+ end
	361	+
	362	+end
1	class Community < Organization	1	class Community < Organization
2	N_('Community')	2	N_('Community')
		3	+ N_('Language')
3		4
4	settings_items :description	5	settings_items :description
		6	+ settings_items :language
5		7
6	xss_terminate :only => [ :name, :address, :contact_phone, :description ]	8	xss_terminate :only => [ :name, :address, :contact_phone, :description ]
7		9
		10	+ FIELDS = %w[
		11	+ description
		12	+ language
		13	+ ]
		14	+
		15	+ def self.fields
		16	+ super + FIELDS
		17	+ end
		18	+
		19	+ def validate
		20	+ self.required_fields.each do \|field\|
		21	+ if self.send(field).blank?
		22	+ self.errors.add(field, _('%{fn} is mandatory'))
		23	+ end
		24	+ end
		25	+ end
		26	+
		27	+ def active_fields
		28	+ environment ? environment.active_community_fields : []
		29	+ end
		30	+
		31	+ def required_fields
		32	+ environment ? environment.required_community_fields : []
		33	+ end
		34	+
8	def name=(value)	35	def name=(value)
9	super(value)	36	super(value)
10	self.identifier = value.to_slug	37	self.identifier = value.to_slug
	@@ -8,6 +8,40 @@ class Enterprise < Organization		@@ -8,6 +8,40 @@ class Enterprise < Organization
8		8
9	extra_data_for_index :product_categories	9	extra_data_for_index :product_categories
10		10
		11	+ N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
		12	+
		13	+ settings_items :organization_website, :historic_and_current_context, :activities_short_description, :zip_code, :city, :state, :country
		14	+
		15	+ FIELDS = %w[
		16	+ zip_code
		17	+ city
		18	+ state
		19	+ country
		20	+ organization_website
		21	+ historic_and_current_context
		22	+ activities_short_description
		23	+ ]
		24	+
		25	+ def self.fields
		26	+ super + FIELDS
		27	+ end
		28	+
		29	+ def validate
		30	+ self.required_fields.each do \|field\|
		31	+ if self.send(field).blank?
		32	+ self.errors.add(field, _('%{fn} is mandatory'))
		33	+ end
		34	+ end
		35	+ end
		36	+
		37	+ def active_fields
		38	+ environment ? environment.active_enterprise_fields : []
		39	+ end
		40	+
		41	+ def required_fields
		42	+ environment ? environment.required_enterprise_fields : []
		43	+ end
		44	+
11	def product_categories	45	def product_categories
12	products.map{\|p\| p.category_full_name}.compact	46	products.map{\|p\| p.category_full_name}.compact
13	end	47	end
	@@ -32,6 +32,8 @@ class Environment < ActiveRecord::Base		@@ -32,6 +32,8 @@ class Environment < ActiveRecord::Base
32	'disable_categories' => _('Disable categories'),	32	'disable_categories' => _('Disable categories'),
33	'disable_cms' => _('Disable CMS'),	33	'disable_cms' => _('Disable CMS'),
34	'disable_header_and_footer' => _('Disable header/footer editing by users'),	34	'disable_header_and_footer' => _('Disable header/footer editing by users'),
		35	+ 'disable_gender_icon' => _('Disable gender icon'),
		36	+ 'disable_categories_menu' => _('Disable the categories menu'),
35	}	37	}
36	end	38	end
37		39
	@@ -231,6 +233,109 @@ class Environment < ActiveRecord::Base		@@ -231,6 +233,109 @@ class Environment < ActiveRecord::Base
231	end	233	end
232	end	234	end
233		235
		236	+ def custom_person_fields
		237	+ self.settings[:custom_person_fields].nil? ? {} : self.settings[:custom_person_fields]
		238	+ end
		239	+
		240	+ def custom_person_fields=(values)
		241	+ if values['schooling'] && values['schooling']['active'] == 'true'
		242	+ schooling_status = values['schooling']
		243	+ end
		244	+ self.settings[:custom_person_fields] = values.delete_if { \|key, value\| ! Person.fields.include?(key)}
		245	+ if schooling_status
		246	+ self.settings[:custom_person_fields]['schooling_status'] = schooling_status
		247	+ end
		248	+ end
		249	+
		250	+ def custom_person_field(field, status)
		251	+ if (custom_person_fields[field] && custom_person_fields[field][status] == 'true')
		252	+ return true
		253	+ end
		254	+ false
		255	+ end
		256	+
		257	+ def active_person_fields
		258	+ (custom_person_fields.delete_if { \|key, value\| !custom_person_field(key, 'active')}).keys \|\| []
		259	+ end
		260	+
		261	+ def required_person_fields
		262	+ required_fields = []
		263	+ active_person_fields.each do \|field\|
		264	+ required_fields << field if custom_person_fields[field]['required'] == 'true'
		265	+ end
		266	+ required_fields
		267	+ end
		268	+
		269	+ def signup_person_fields
		270	+ signup_fields = []
		271	+ active_person_fields.each do \|field\|
		272	+ signup_fields << field if custom_person_fields[field]['signup'] == 'true'
		273	+ end
		274	+ signup_fields
		275	+ end
		276	+
		277	+ def custom_enterprise_fields
		278	+ self.settings[:custom_enterprise_fields].nil? ? {} : self.settings[:custom_enterprise_fields]
		279	+ end
		280	+
		281	+ def custom_enterprise_fields=(values)
		282	+ self.settings[:custom_enterprise_fields] = values.delete_if { \|key, value\| ! Enterprise.fields.include?(key)}
		283	+ end
		284	+
		285	+ def custom_enterprise_field(field, status)
		286	+ if (custom_enterprise_fields[field] && custom_enterprise_fields[field][status] == 'true')
		287	+ return true
		288	+ end
		289	+ false
		290	+ end
		291	+
		292	+ def active_enterprise_fields
		293	+ (custom_enterprise_fields.delete_if { \|key, value\| !custom_enterprise_field(key, 'active')}).keys \|\| []
		294	+ end
		295	+
		296	+ def required_enterprise_fields
		297	+ required_fields = []
		298	+ active_enterprise_fields.each do \|field\|
		299	+ required_fields << field if custom_enterprise_fields[field]['required'] == 'true'
		300	+ end
		301	+ required_fields
		302	+ end
		303	+
		304	+ def custom_community_fields
		305	+ self.settings[:custom_community_fields].nil? ? {} : self.settings[:custom_community_fields]
		306	+ end
		307	+
		308	+ def custom_community_fields=(values)
		309	+ self.settings[:custom_community_fields] = values.delete_if { \|key, value\| ! Community.fields.include?(key)}
		310	+ end
		311	+
		312	+ def custom_community_field(field, status)
		313	+ if (custom_community_fields[field] && custom_community_fields[field][status] == 'true')
		314	+ return true
		315	+ end
		316	+ false
		317	+ end
		318	+
		319	+ def active_community_fields
		320	+ (custom_community_fields.delete_if { \|key, value\| !custom_community_field(key, 'active')}).keys
		321	+ end
		322	+
		323	+ def required_community_fields
		324	+ required_fields = []
		325	+ active_community_fields.each do \|field\|
		326	+ required_fields << field if custom_community_fields[field]['required'] == 'true'
		327	+ end
		328	+ required_fields
		329	+ end
		330	+
		331	+ def category_types
		332	+ self.settings[:category_types].nil? ? ['Category'] : self.settings[:category_types]
		333	+ end
		334	+
		335	+ def category_types=(values)
		336	+ self.settings[:category_types] = values
		337	+ end
		338	+
234	# Whether this environment should force having 'www.' in its domain name or	339	# Whether this environment should force having 'www.' in its domain name or
235	# not. Defauls to false.	340	# not. Defauls to false.
236	#	341	#
	@@ -43,6 +43,29 @@ class Organization < Profile		@@ -43,6 +43,29 @@ class Organization < Profile
43	!self.validation_info.nil?	43	!self.validation_info.nil?
44	end	44	end
45		45
		46	+ FIELDS = %w[
		47	+ nickname
		48	+ contact_person
		49	+ contact_phone
		50	+ contact_email
		51	+ legal_form
		52	+ economic_activity
		53	+ management_information
		54	+ address
		55	+ ]
		56	+
		57	+ def self.fields
		58	+ FIELDS
		59	+ end
		60	+
		61	+ def required_fields
		62	+ []
		63	+ end
		64	+
		65	+ def active_fields
		66	+ []
		67	+ end
		68	+
46	N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated')	69	N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated')
47	settings_items :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj	70	settings_items :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj
48		71
	@@ -41,6 +41,70 @@ class Person < Profile		@@ -41,6 +41,70 @@ class Person < Profile
41	friends.delete(friend)	41	friends.delete(friend)
42	end	42	end
43		43
		44	+ FIELDS = %w[
		45	+ nickname
		46	+ sex
		47	+ address
		48	+ zip_code
		49	+ city
		50	+ state
		51	+ country
		52	+ nationality
		53	+ birth_date
		54	+ cell_phone
		55	+ comercial_phone
		56	+ schooling
		57	+ professional_activity
		58	+ organization
		59	+ organization_website
		60	+ area_of_study
		61	+ custom_area_of_study
		62	+ formation
		63	+ custom_formation
		64	+ contact_phone
		65	+ contact_information
		66	+ ]
		67	+
		68	+ def self.fields
		69	+ FIELDS
		70	+ end
		71	+
		72	+ def validate
		73	+ self.required_fields.each do \|field\|
		74	+ if self.send(field).blank?
		75	+ unless (field == 'custom_area_of_study' && self.area_of_study != 'Others') \|\| (field == 'custom_formation' && self.formation != 'Others')
		76	+ self.errors.add(field, _('%{fn} is mandatory'))
		77	+ end
		78	+ end
		79	+ end
		80	+ end
		81	+
		82	+ before_save do \|person\|
		83	+ person.custom_formation = nil if (! person.formation.nil? && person.formation != 'Others')
		84	+ person.custom_area_of_study = nil if (! person.area_of_study.nil? && person.area_of_study != 'Others')
		85	+ end
		86	+
		87	+ def active_fields
		88	+ environment ? environment.active_person_fields : []
		89	+ end
		90	+
		91	+ def required_fields
		92	+ environment ? environment.required_person_fields : []
		93	+ end
		94	+
		95	+ def signup_fields
		96	+ environment ? environment.signup_person_fields : []
		97	+ end
		98	+
		99	+ N_('Cell phone'); N_('Comercial phone'); N_('Nationality'); N_('Schooling'); N_('Area of study'); N_('Professional activity'); N_('Organization'); N_('Organization website');
		100	+ settings_items :cell_phone, :comercial_phone, :nationality, :schooling, :area_of_study, :professional_activity, :organization, :organization_website
		101	+
		102	+ N_('Schooling status')
		103	+ settings_items :schooling_status
		104	+
		105	+ N_('Formation'); N_('Custom formation'); N_('Custom area of study');
		106	+ settings_items :formation, :custom_formation, :custom_area_of_study
		107	+
44	N_('Contact information'); N_('Birth date'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')	108	N_('Contact information'); N_('Birth date'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
45	settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country, :zip_code	109	settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country, :zip_code
46		110
	@@ -28,6 +28,13 @@ class User < ActiveRecord::Base		@@ -28,6 +28,13 @@ class User < ActiveRecord::Base
28	user.person.name \|\|= user.login	28	user.person.name \|\|= user.login
29	user.person.update_attributes(:identifier => user.login, :user_id => user.id, :environment_id => user.environment_id)	29	user.person.update_attributes(:identifier => user.login, :user_id => user.id, :environment_id => user.environment_id)
30	end	30	end
		31	+
		32	+ def signup!
		33	+ User.transaction do
		34	+ self.save!
		35	+ self.person.save!
		36	+ end
		37	+ end
31		38
32	has_one :person, :dependent => :destroy	39	has_one :person, :dependent => :destroy
33	belongs_to :environment	40	belongs_to :environment
	@@ -11,4 +11,6 @@		@@ -11,4 +11,6 @@
11	<li><%= link_to _('Manage User roles'), :controller => 'role' %></li>	11	<li><%= link_to _('Manage User roles'), :controller => 'role' %></li>
12	<li><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></li>	12	<li><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></li>
13	<li><%= link_to _('Manage Templates'), :action => 'manage_templates' %></li>	13	<li><%= link_to _('Manage Templates'), :action => 'manage_templates' %></li>
		14	+ <li><%= link_to _('Edit Templates'), :action => 'edit_templates' %></li>
		15	+ <li><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></li>
14	</ul>	16	</ul>