Fixing the Enterprise Registering Process

* The registration has two validation type: region and admin. + Admin - There is no validator to choose. - The regions to choose are states (This might be changed in the future). - The admins of the environment recieves the task to approve the registration of this new enterprise. - The region field isn't displayed. + Region - If there isn't any validator, shows a message that it's not possible to register any enterprise and don't show the form. - Show only the regions where is registered at least one validator. - The region field is displayed. * The required fields are highlithed. * The fields that are active or required are set through the administration panel. * Only the fields name and identifier are always required. * After registering a new enterprise, the user is set as an admin of it. * The cancel button in the register form is working properly. * In the "Validator" step, the radio button is choosing a default option. * Cancel radio_button in the task validation has a "Rejection Explanation" field that is required. * Some navigation buttons added. * Changed some buttons to labelled buttons. * The "Register a new enterprise" button is an admin option. (ActionItem1482)

Fixing the Enterprise Registering Process
* The registration has two validation type: region and admin. + Admin - There is no validator to choose. - The regions to choose are states (This might be changed in the future). - The admins of the environment recieves the task to approve the registration of this new enterprise. - The region field isn't displayed. + Region - If there isn't any validator, shows a message that it's not possible to register any enterprise and don't show the form. - Show only the regions where is registered at least one validator. - The region field is displayed. * The required fields are highlithed. * The fields that are active or required are set through the administration panel. * Only the fields name and identifier are always required. * After registering a new enterprise, the user is set as an admin of it. * The cancel button in the register form is working properly. * In the "Validator" step, the radio button is choosing a default option. * Cancel radio_button in the task validation has a "Rejection Explanation" field that is required. * Some navigation buttons added. * Changed some buttons to labelled buttons. * The "Register a new enterprise" button is an admin option. (ActionItem1482)
Rodrigo Souto · Antonio Terceiro
1 parent fcc26970
Showing 19 changed files with 367 additions and 77 deletions Show diff stats
app/controllers/public/enterprise_registration_controller.rb
app/models/create_enterprise.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/region.rb
app/views/enterprise_registration/basic_information.rhtml
app/views/enterprise_registration/select_validator.rhtml
app/views/memberships/index.rhtml
app/views/profile/enterprises.rhtml
app/views/profile_editor/_organization.rhtml
app/views/shared/_custom_fields.rhtml
app/views/tasks/_task.rhtml
features/location.feature
features/register_enterprise.feature
features/step_definitions/noosfero_steps.rb
test/functional/enterprise_registration_controller_test.rb
test/integration/enterprise_registration_test.rb
test/unit/create_enterprise_test.rb
test/unit/region_test.rb
@@ -9,15 +9,20 @@ class EnterpriseRegistrationController &lt; ApplicationController
   # FIXME: shouldn't this action present some sort of welcome message and point
   # to the first step explicitly?
   def index
+    @validation = environment.organization_approval_method
     @create_enterprise = CreateEnterprise.new(params[:create_enterprise])
-    if params[:create_enterprise] && params[:create_enterprise][:target_id]
-      @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
+    if @validation == :region
+      if params[:create_enterprise] && params[:create_enterprise][:target_id]
+        @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
+      end
+    elsif @validation == :admin
+        @create_enterprise.target = @create_enterprise.environment
     end
     @create_enterprise.requestor = current_user.person
     the_action =
       if request.post?
         if @create_enterprise.valid_before_selecting_target?
-          if @create_enterprise.valid?
+          if @create_enterprise.valid? || @validation == :admin
             :confirmation
           else
             :select_validator
@@ -38,7 +43,9 @@ class EnterpriseRegistrationController &lt; ApplicationController
   #
   # Posts back.
   def basic_information
-    @regions = environment.regions.select{|i| i.has_validator?}.map {|item| [item.name, item.id]}
+    if @validation == :region
+      @regions = @create_enterprise.available_regions.map {|region| [region.name, region.id]}
+    end
   end
  
   # present information about validator organizations, and the user one to
@@ -11,7 +11,7 @@ class CreateEnterprise &lt; Task
   N_('Economic activity')
   N_('Management information')
  
-  DATA_FIELDS = %w[ name identifier address contact_phone contact_person acronym foundation_year legal_form economic_activity management_information region_id reject_explanation ]
+  DATA_FIELDS = Enterprise.fields + %w[name identifier region_id reject_explanation]
  
   serialize :data, Hash
   attr_protected :data
@@ -31,20 +31,30 @@ class CreateEnterprise &lt; Task
   end
  
   # checks for virtual attributes 
-  validates_presence_of :name, :identifier, :address, :contact_phone, :contact_person, :legal_form, :economic_activity, :region_id
+  validates_presence_of :name, :identifier
+
+  #checks if the validation method is region to validates
+  validates_presence_of :region_id, :if => lambda { |obj| obj.environment.organization_approval_method == :region }
+
   validates_format_of :foundation_year, :with => /^\d*$/
  
   # checks for actual attributes
   validates_presence_of :requestor_id, :target_id
  
+  # checks for admins required attributes
+  DATA_FIELDS.each do |attribute|
+    validates_presence_of attribute, :if => lambda { |obj| obj.environment.required_enterprise_fields.include?(attribute) }
+  end
+
   # check for explanation when rejecting
   validates_presence_of :reject_explanation, :if => (lambda { |record| record.status == Task::Status::CANCELLED } )
  
   xss_terminate :only => [ :acronym, :address, :contact_person, :contact_phone, :economic_activity, :legal_form, :management_information, :name ], :on => 'validation'
  
   def validate
+
     if self.region && self.target
-      unless self.region.validators.include?(self.target)
+      unless self.region.validators.include?(self.target) || self.target_type == "Environment"
         self.errors.add(:target, '%{fn} is not a validator for the chosen region')
       end
     end
@@ -58,7 +68,7 @@ class CreateEnterprise &lt; Task
     if valid?
       true
     else
-      self.errors.size == 1 and self.errors[:target_id]
+      self.errors.size == 1 && !self.errors[:target_id].nil?
     end
   end
  
@@ -81,7 +91,27 @@ class CreateEnterprise &lt; Task
   end
  
   def environment
-    region ? region.environment : nil
+    region ? region.environment : self.requestor ? self.requestor.environment : Environment.default
+  end
+
+  def available_regions
+    environment.regions.with_validators
+  end
+
+  def active_fields
+    environment ? environment.active_enterprise_fields : []
+  end
+
+  def required_fields
+    environment ? environment.required_enterprise_fields : []
+  end
+
+  def community?
+    false
+  end
+
+  def enterprise?
+    true
   end
  
   # Rejects the enterprise registration request.
@@ -107,21 +137,16 @@ class CreateEnterprise &lt; Task
   def perform
     enterprise = Enterprise.new
  
-    profile_fields = %w[ name identifier contact_phone address region_id ]
-    profile_fields.each do |field|
+    DATA_FIELDS.reject{|field| field == "reject_explanation"}.each do |field|
       enterprise.send("#{field}=", self.send(field))
     end
  
-    organization_data = self.data.reject do |key,value|
-      profile_fields.include?(key.to_s)
-    end
-
     enterprise.environment = environment
  
     enterprise.user = self.requestor.user
  
-    enterprise.update_attributes(organization_data)
     enterprise.save!
+    enterprise.add_admin(enterprise.user.person)
   end
  
   def description
@@ -34,6 +34,8 @@ class Enterprise &lt; Organization
     organization_website
     historic_and_current_context
     activities_short_description
+    acronym
+    foundation_year
   ]
  
   def self.fields
@@ -44,7 +46,7 @@ class Enterprise &lt; Organization
     super
     self.required_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} is mandatory'))
+        self.errors.add(field, _("%{fn} can't be blank"))
       end
     end
   end
@@ -89,6 +89,7 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
+      'disable_enterprise_registration' => _('Disable the enterprise registration'),
       'join_community_popup' => _('Ask users to join a group/community with a popup'),
  
       'enterprise_activation' => _('Enable activation of enterprises'),
@@ -14,6 +14,10 @@ class Region &lt; Category
   def has_validator?
     validators.count > 0
   end
+
+  def self.with_validators
+    Region.find(:all, :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)')
+  end
  
 end
  
@@ -2,34 +2,34 @@
  
 <h2><%= _('Register enterprise') %></h2>
  
-<h3> <%= _('How to proceed') %> </h3>
-<p> <%= _('Fill the form and hit the Register button then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state), when the enterprise is aproved you will be able to activate its profile')  %> </p>
-
-<% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
-  <%= f.text_field 'identifier', 'size' => 20 %>
-
-  <%= f.text_field 'name', 'size' => 20 %>
-  
-  <%= f.text_field 'address', 'size' => 50 %>
-
-  <%= f.text_field 'contact_phone', 'size' => 20 %>
-  
-  <%= f.text_field 'contact_person', 'size' => 20  %>
-  
-  <%= f.text_field 'acronym', 'size' => 20 %>
-  
-  <%= f.text_field 'foundation_year', 'size' => 20  %>
-  
-  <%= f.text_field 'legal_form', 'size' => 20 %>
-  
-  <%= f.text_field 'economic_activity', 'size' => 20 %>
-  
-  <%= labelled_form_field(_('Management information'), text_editor('create_enterprise', 'management_information')) %>
-
-  <%= labelled_form_field(_('Region'), f.select('region_id', @regions)) %>
+
+<% if @validation == :region && @regions.empty? %>
+  <div class='atention'>
+    <%= _('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
+  </div>
  
   <% button_bar do %>
-    <%= submit_button('next', _('Next'), :cancel => {:action => 'index'}) %>
+    <%= button :back, _('Go back'), { :profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile" }%>
+  <% end %>
+<% else %>
+  <div class='atention'>
+    <%= _('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.')  %>
+  </div>
+
+  <%= required_fields_message %>
+
+  <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+    <%= required f.text_field 'identifier'%>
+    <%= required f.text_field 'name'%>
+    <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %>
+    <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
+
+    <% if @validation == :admin %>
+      <%= hidden_field_tag  'create_enterprise[target_id]', environment.id %>
+    <% end %>
+
+    <% button_bar do %>
+      <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
+    <% end %>
   <% end %>
-
 <% end %>
@@ -9,8 +9,7 @@
  
   <% for validator in @validators %>
     <div>
-      <%= radio_button_tag('create_enterprise[target_id]', validator.id) %>
-      <%= validator.name %>
+      <%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id, true %>
  
       <%= labelled_form_field(_('Validation Methodology:'), validator.validation_methodology || _("(not informed)")) %>
       <%= labelled_form_field(_('Restrictions (if any):'), validator.validation_restrictions || _("(not informed)")) %>
@@ -4,6 +4,7 @@
  
 <% button_bar do %>
   <%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
+  <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if !environment.enabled?('disable_enterprise_registration') %>
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
  
@@ -12,8 +12,7 @@
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' },
       :help => _('Back to the page where you come from.') %>
-  <%= button :add, __('Register a new Enterprise'),
-      :controller => 'enterprise_registration' if logged_in? %>
+  <%= button :add, __('Register a new Enterprise'), :controller => 'enterprise_registration' if logged_in? && !environment.enabled?('disable_enterprise_registration') %>
 <% end %>
  
 </div><!-- fim class="common-profile-list-block" -->
 <h2><%= _('General information') %></h2>
  
-  <%= required_fields_message if @profile.required_fields.any? %>
+  <%= required_fields_message %>
  
   <%= required f.text_field(:name) %>
  
@@ -66,9 +66,6 @@
     </div>
 <% end %>
  
-  <%= f.text_field(:acronym) %>
-  <%= f.text_field(:foundation_year) %>
-
   <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile, :only_required => false } %>
  
   <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
@@ -12,6 +12,7 @@
 <%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address)), only_required) %>
  
 <% if profile.enterprise? %>
+  <%= optional_field(profile, 'business_name', f.text_field(:business_name), only_required) %>
   <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code)), only_required) %>
   <%= optional_field(profile, 'city', f.text_field(:city), only_required) %>
   <%= optional_field(profile, 'state', f.text_field(:state), only_required) %>
@@ -19,4 +20,6 @@
   <%= optional_field(profile, 'organization_website', f.text_field(:organization_website), only_required) %>
   <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5), only_required) %>
   <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5), only_required) %>
+  <%= optional_field(profile, 'acronym', f.text_field(:acronym), only_required) %>
+  <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year), only_required) %>
 <% end %>
@@ -4,12 +4,14 @@
 <% form_for('task', task, :url => { :action => 'close', :id => task.id}) do |f| %>
  
   <div>
-    <%= radio_button_tag(:decision, 'finish', true) %>
-    <%= _('OK') %>
+    <%= labelled_radio_button _('OK'), :decision, 'finish', true, :onclick => 'if(this.checked) $("rejection-field").style.display="none"' %>
   </div>
   <div>
-    <%= radio_button_tag(:decision, 'cancel', false) %>
-    <%= _('Cancel') %>
+    <%= labelled_radio_button _('Cancel'), :decision, 'cancel', false, :onclick => 'if(this.checked) $("rejection-field").style.display="block"' %>
+  </div>
+
+  <div id="rejection-field" style='display: none'>
+    <%= required labelled_form_field(_('Rejection explanation'), text_area(:task, :reject_explanation, :rows => 5))%>
   </div>
  
   <% button_bar do %>
@@ -10,7 +10,7 @@ Feature: Location
     And I am logged in as "zezinho"
  
   Scenario: editing my address
-    Given the following Person fields are enabled
+    Given the following Person fields are active
       | address  |
       | country  |
       | state    |
@@ -29,7 +29,7 @@ Feature: Location
       | Rua Marechal Floriano, 28 | BR      | Bahia | Salvador | 40110010 |
  
   Scenario Outline: editing address of collectives
-    Given the following <class> fields are enabled
+    Given the following <class> fields are active
       | address  |
       | country  |
       | state    |
@@ -0,0 +1,191 @@
+Feature: register enterprise
+  As a noosfero user
+  I want to register an enterprise
+  In order to interact in the web with my enterprise
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+
+  Scenario: enterprise registration is disabled by admin
+    Given feature "disable_enterprise_registration" is enabled on environment
+    When I follow "Manage my groups"
+    Then I should not see "Register a new enterprise"
+
+  Scenario: approval method is admin
+    Given organization_approval_method is "admin" on environment
+    And I follow "Manage my groups"
+    When I follow "Register a new enterprise"
+    Then I should not see "Region"
+
+  Scenario: approval method is region
+    Given organization_approval_method is "region" on environment
+    And the following enterprise
+      | name      | identifier | owner     |
+      | Validator | validator  | joaosilva |
+    And the following validation info
+      | validation_methodology | organization_name |
+      | "Sample methodology"   | Validator         |
+    And the following states
+      | name          | validator_name |
+      | Sample State  | Validator      |
+    And I follow "Manage my groups"
+    When I follow "Register a new enterprise"
+    Then I should see "Region"
+
+  Scenario: approval method is by region validator but there are no validators
+    Given organization_approval_method is "region" on environment
+    And I follow "Manage my groups"
+    When I follow "Register a new enterprise"
+    Then I should see "There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions."
+
+  Scenario: some active fields
+    Given the following enterprise fields are active
+      | foundation_year |
+      | contact_person  |
+      | contact_email   |
+    And I follow "Manage my groups"
+    When I follow "Register a new enterprise"
+    Then I should see "Foundation year"
+    Then I should see "Contact person"
+    Then I should see "Contact email"
+
+  Scenario: some required fields
+    Given organization_approval_method is "admin" on environment
+    And I follow "Manage my groups"
+    And the following states
+      | name          |
+      | Sample State  |
+    And the following enterprise fields are required
+      | foundation_year |
+      | contact_person  |
+      | contact_email   |
+    And I follow "Register a new enterprise"
+    And I fill in the following:
+      | Identifier        | my-enterprise   |
+      | Name              | My Enterprise   |
+      | Foundation year   |                 |
+      | Contact person    |                 |
+      | Contact email     |                 |
+    When I press "Next"
+    Then I should see "Foundation year can't be blank"
+    Then I should see "Contact person can't be blank"
+    Then I should see "Contact email can't be blank"
+
+  Scenario: a user register an enterprise successfully through the admin
+            validator method and the admin accepts
+    Given organization_approval_method is "admin" on environment
+    And I follow "Manage my groups"
+    And the following states
+      | name          |
+      | Sample State  |
+    And I follow "Register a new enterprise"
+    And I fill in the following:
+      | Identifier        | my-enterprise   |
+      | Name              | My Enterprise   |
+    And I press "Next"
+    Then I should see "Enterprise Registration completed"
+    And I am logged in as admin
+    And I follow "Control panel"
+    When I follow "Tasks"
+    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    And I choose "Ok"
+    And I press "Ok"
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    When I follow "Manage my groups"
+    Then I should see "My Enterprise"
+
+  Scenario: a user register an enterprise successfully through the admin
+            validator method and the admin rejects
+    Given organization_approval_method is "admin" on environment
+    And I follow "Manage my groups"
+    And the following states
+      | name          |
+      | Sample State  |
+    And I follow "Register a new enterprise"
+    And I fill in the following:
+      | Identifier        | my-enterprise   |
+      | Name              | My Enterprise   |
+    And I press "Next"
+    Then I should see "Enterprise Registration completed"
+    And I am logged in as admin
+    And I follow "Control panel"
+    When I follow "Tasks"
+    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    And I choose "Cancel"
+    And I fill in "Rejection explanation" with "This enterprise has some irregularities."
+    And I press "Ok"
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    When I follow "Manage my groups"
+    Then I should not see "My Enterprise"
+
+    Scenario: a user register an enterprise successfully through the region
+              validator method and the validator accepts
+    Given organization_approval_method is "region" on environment
+    And I follow "Manage my groups"
+    And the following enterprise
+      | name      | identifier | owner     |
+      | Validator | validator  | joaosilva |
+    And the following validation info
+      | validation_methodology | organization_name |
+      | "Sample methodology"   | Validator         |
+    And the following states
+      | name          | validator_name |
+      | Sample State  | Validator      |
+    And I follow "Register a new enterprise"
+    And I fill in the following:
+      | Identifier        | my-enterprise   |
+      | Name              | My Enterprise   |
+    And I select "Sample State" from "Region"
+    And I press "Next"
+    Then I should see "Validator"
+    Then I should see "Sample methodology"
+    When I press "Confirm"
+    Then I should see "Enterprise Registration completed"
+    And I am on Validator's control panel
+    When I follow "Tasks"
+    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    And I choose "Ok"
+    And I press "Ok"
+    And I am on Joao Silva's control panel
+    When I follow "Manage my groups"
+    Then I should see "My Enterprise"
+
+  Scenario: a user register an enterprise successfully through the region
+            validator method and the validator rejects
+    Given organization_approval_method is "region" on environment
+    And I follow "Manage my groups"
+    And the following enterprise
+      | name      | identifier | owner     |
+      | Validator | validator  | joaosilva |
+    And the following validation info
+      | validation_methodology | organization_name |
+      | "Sample methodology"   | Validator         |
+    And the following states
+      | name          | validator_name |
+      | Sample State  | Validator      |
+    And I follow "Register a new enterprise"
+    And I fill in the following:
+      | Identifier        | my-enterprise   |
+      | Name              | My Enterprise   |
+    And I select "Sample State" from "Region"
+    And I press "Next"
+    Then I should see "Validator"
+    Then I should see "Sample methodology"
+    When I press "Confirm"
+    Then I should see "Enterprise Registration completed"
+    And I am on Validator's control panel
+    When I follow "Tasks"
+    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    And I choose "Cancel"
+    And I fill in "Rejection explanation" with "This enterprise has some irregularities."
+    And I press "Ok"
+    And I am on Joao Silva's control panel
+    When I follow "Manage my groups"
+    Then I should not see "My Enterprise"
@@ -65,7 +65,27 @@ Given /^the following products$/ do |table|
   end
 end
  
+Given /^the following states$/ do |table|
+  table.hashes.each do |item|
+    data = item.dup
+    if validator = Enterprise.find_by_name(data.delete("validator_name"))
+      State.create!(data.merge(:environment => Environment.default, :validators => [validator]))
+    else
+      r = State.create!(data.merge(:environment => Environment.default))
+    end
+  end
+end
+
+Given /^the following validation info$/ do |table|
+  table.hashes.each do |item|
+    data = item.dup
+    organization = Organization.find_by_name(data.delete("organization_name"))
+    ValidationInfo.create!(data.merge(:organization => organization))
+  end
+end
+
 Given /^I am logged in as "(.+)"$/ do |username|
+  visit('/account/logout')
   visit('/account/login')
   fill_in("Username", :with => username)
   fill_in("Password", :with => '123456')
@@ -73,6 +93,7 @@ Given /^I am logged in as &quot;(.+)&quot;$/ do |username|
 end
  
 Given /^I am logged in as admin$/ do
+  visit('/account/logout')
   user = User.create!(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
   e = Environment.default
   e.add_admin(user.person)
@@ -86,15 +107,16 @@ Given /^I am not logged in$/ do
   visit('/account/logout')
 end
  
-Given /^feature "(.+)" is enabled on environment$/ do |feature|
+Given /^feature "(.+)" is (enabled|disabled) on environment$/ do |feature, status|
   e = Environment.default
-  e.enable(feature)
+  status.chop!
+  e.send status, feature
   e.save
 end
  
-Given /^feature "(.+)" is disabled on environment$/ do |feature|
+Given /^organization_approval_method is "(.+)" on environment$/ do |approval_method|
    e = Environment.default
-   e.disable(feature)
+   e.organization_approval_method = approval_method
    e.save
 end
  
@@ -122,17 +144,18 @@ Given /^&quot;([^\&quot;]*)&quot; has no articles$/ do |profile|
   (Profile[profile] || Profile.find_by_name(profile)).articles.delete_all
 end
  
-Given /^the following (\w+) fields are enabled$/ do |klass, table|
+Given /^the following (\w+) fields are (\w+)$/ do |klass, status, table|
   env = Environment.default
   fields = table.raw.inject({}) do |hash, line|
     hash[line.first] = { "active" => 'true' }
+    hash[line.first].merge!({ "required" => 'true'}) if status == "required"
     hash
   end
  
   env.send("custom_#{klass.downcase}_fields=", fields)
   env.save!
-  if fields.keys != env.send("active_#{klass.downcase}_fields")
-    raise "Not all fields enabled! Requested: %s; Enabled: %s" % [fields.keys.inspect, env.send("active_#{klass.downcase}_fields").inspect] 
+  if fields.keys != env.send("#{status}_#{klass.downcase}_fields")
+    raise "Not all fields #{status}! Requested: %s; #{status.camelcase}: %s" % [fields.keys.inspect, env.send("#{status}_#{klass.downcase}_fields").inspect] 
   end
 end
  
@@ -30,23 +30,29 @@ all_fixtures
     assert_template 'basic_information'
   end
  
-  should 'prompt for basic information' do
-    get :index
-    %w[ name identifier address contact_phone contact_person
-        acronym foundation_year legal_form economic_activity ].each do |item|
-      assert_tag :tag => 'input', :attributes => { :name => "create_enterprise[#{item}]" }
-    end
-    assert_tag :tag => 'textarea', :attributes => { :name => "create_enterprise[management_information]"}
-    assert_tag :tag => 'select', :attributes => { :name => "create_enterprise[region_id]"}
-  end
-
   should 'get back to entering basic information if data is invalid' do
     post :index, :create_enterprise => {}
     assert_response :success
     assert_template 'basic_information'
   end
  
-  should 'prompt for selecting validator' do
+  should 'skip prompt for selection validator if approval method is admin' do
+    env = Environment.default
+    env.organization_approval_method = :admin
+    env.save
+    region = fast_create(Region)
+
+    data = { :name => 'My new enterprise', :identifier => 'mynew', :region => region }
+    create_enterprise = CreateEnterprise.new(data)
+
+    post :index, :create_enterprise => data
+    assert_template 'confirmation'
+  end
+
+  should 'prompt for selecting validator if approval method is region' do
+    env = Environment.default
+    env.organization_approval_method = :region
+    env.save
     data = { 'name' => 'My new enterprise', 'identifier' => 'mynew' }
  
     create_enterprise = CreateEnterprise.new
@@ -135,8 +141,10 @@ all_fixtures
     assert_sanitized assigns(:create_enterprise).management_information
   end
  
-  should 'load only regions with validator organizations' do
+  should 'load only regions with validator organizations if approval method is region' do
     env = Environment.default
+    env.organization_approval_method = :region
+    env.save
  
     reg1 = env.regions.create!(:name => 'Region with validator')
     reg1.validators.create!(:name => 'Validator one', :identifier => 'validator-one')
@@ -7,6 +7,8 @@ class EnterpriseRegistrationTest &lt; ActionController::IntegrationTest
   should 'be able to create an enterprise registration request' do
  
     environment = Environment.default
+    environment.organization_approval_method = :region
+    environment.save
     region1 = environment.regions.build(:name => 'A region')
     region1.save!
     region2 = environment.regions.build(:name => 'Other region')
@@ -219,6 +219,21 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
     assert request.errors.invalid?(:identifier)
   end
  
+  should 'require the same fields as an enterprise does' do
+    environment = mock
+    request = CreateEnterprise.new
+    request.stubs(:environment).returns(environment)
+    environment.stubs(:organization_approval_method).returns(:region)
+
+    environment.stubs(:required_enterprise_fields).returns([])
+    request.valid?
+    assert_nil request.errors[:contact_person], 'should not require contact_person unless Enterprise requires it'
+
+    environment.stubs(:required_enterprise_fields).returns(['contact_person'])
+    request.valid?
+    assert_not_nil request.errors[:contact_person], 'should require contact_person when Enterprise requires it'
+  end
+
   should 'has permission to validate enterprise' do
     t = CreateEnterprise.new
     assert_equal :validate_enterprise, t.permission
@@ -53,4 +53,15 @@ class RegionTest &lt; Test::Unit::TestCase
     assert !region.has_validator?
   end
  
+  should 'list regions with validators' do
+    bahia = fast_create(Region, :name => 'Bahia')
+    forum_ecosol_ba = fast_create(Enterprise, :name => 'Forum Baiano de Economia Solidaria', :identifier => 'ecosol-ba')
+    bahia.validators << forum_ecosol_ba
+
+    sergipe = fast_create(Region, :name => 'Sergipe')
+    # Sergipe has no validators
+
+    assert_equivalent Region.with_validators, [bahia]
+  end
+
 end
...	...	@@ -9,15 +9,20 @@ class EnterpriseRegistrationController < ApplicationController
9	9	# FIXME: shouldn't this action present some sort of welcome message and point
10	10	# to the first step explicitly?
11	11	def index
	12	+ @validation = environment.organization_approval_method
12	13	@create_enterprise = CreateEnterprise.new(params[:create_enterprise])
13		- if params[:create_enterprise] && params[:create_enterprise][:target_id]
14		- @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
	14	+ if @validation == :region
	15	+ if params[:create_enterprise] && params[:create_enterprise][:target_id]
	16	+ @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
	17	+ end
	18	+ elsif @validation == :admin
	19	+ @create_enterprise.target = @create_enterprise.environment
15	20	end
16	21	@create_enterprise.requestor = current_user.person
17	22	the_action =
18	23	if request.post?
19	24	if @create_enterprise.valid_before_selecting_target?
20		- if @create_enterprise.valid?
	25	+ if @create_enterprise.valid? \|\| @validation == :admin
21	26	:confirmation
22	27	else
23	28	:select_validator
...	...	@@ -38,7 +43,9 @@ class EnterpriseRegistrationController < ApplicationController
38	43	#
39	44	# Posts back.
40	45	def basic_information
41		- @regions = environment.regions.select{\|i\| i.has_validator?}.map {\|item\| [item.name, item.id]}
	46	+ if @validation == :region
	47	+ @regions = @create_enterprise.available_regions.map {\|region\| [region.name, region.id]}
	48	+ end
42	49	end
43	50
44	51	# present information about validator organizations, and the user one to
...	...
...	...	@@ -11,7 +11,7 @@ class CreateEnterprise < Task
11	11	N_('Economic activity')
12	12	N_('Management information')
13	13
14		- DATA_FIELDS = %w[ name identifier address contact_phone contact_person acronym foundation_year legal_form economic_activity management_information region_id reject_explanation ]
	14	+ DATA_FIELDS = Enterprise.fields + %w[name identifier region_id reject_explanation]
15	15
16	16	serialize :data, Hash
17	17	attr_protected :data
...	...	@@ -31,20 +31,30 @@ class CreateEnterprise < Task
31	31	end
32	32
33	33	# checks for virtual attributes
34		- validates_presence_of :name, :identifier, :address, :contact_phone, :contact_person, :legal_form, :economic_activity, :region_id
	34	+ validates_presence_of :name, :identifier
	35	+
	36	+ #checks if the validation method is region to validates
	37	+ validates_presence_of :region_id, :if => lambda { \|obj\| obj.environment.organization_approval_method == :region }
	38	+
35	39	validates_format_of :foundation_year, :with => /^\d*$/
36	40
37	41	# checks for actual attributes
38	42	validates_presence_of :requestor_id, :target_id
39	43
	44	+ # checks for admins required attributes
	45	+ DATA_FIELDS.each do \|attribute\|
	46	+ validates_presence_of attribute, :if => lambda { \|obj\| obj.environment.required_enterprise_fields.include?(attribute) }
	47	+ end
	48	+
40	49	# check for explanation when rejecting
41	50	validates_presence_of :reject_explanation, :if => (lambda { \|record\| record.status == Task::Status::CANCELLED } )
42	51
43	52	xss_terminate :only => [ :acronym, :address, :contact_person, :contact_phone, :economic_activity, :legal_form, :management_information, :name ], :on => 'validation'
44	53
45	54	def validate
	55	+
46	56	if self.region && self.target
47		- unless self.region.validators.include?(self.target)
	57	+ unless self.region.validators.include?(self.target) \|\| self.target_type == "Environment"
48	58	self.errors.add(:target, '%{fn} is not a validator for the chosen region')
49	59	end
50	60	end
...	...	@@ -58,7 +68,7 @@ class CreateEnterprise < Task
58	68	if valid?
59	69	true
60	70	else
61		- self.errors.size == 1 and self.errors[:target_id]
	71	+ self.errors.size == 1 && !self.errors[:target_id].nil?
62	72	end
63	73	end
64	74
...	...	@@ -81,7 +91,27 @@ class CreateEnterprise < Task
81	91	end
82	92
83	93	def environment
84		- region ? region.environment : nil
	94	+ region ? region.environment : self.requestor ? self.requestor.environment : Environment.default
	95	+ end
	96	+
	97	+ def available_regions
	98	+ environment.regions.with_validators
	99	+ end
	100	+
	101	+ def active_fields
	102	+ environment ? environment.active_enterprise_fields : []
	103	+ end
	104	+
	105	+ def required_fields
	106	+ environment ? environment.required_enterprise_fields : []
	107	+ end
	108	+
	109	+ def community?
	110	+ false
	111	+ end
	112	+
	113	+ def enterprise?
	114	+ true
85	115	end
86	116
87	117	# Rejects the enterprise registration request.
...	...	@@ -107,21 +137,16 @@ class CreateEnterprise < Task
107	137	def perform
108	138	enterprise = Enterprise.new
109	139
110		- profile_fields = %w[ name identifier contact_phone address region_id ]
111		- profile_fields.each do \|field\|
	140	+ DATA_FIELDS.reject{\|field\| field == "reject_explanation"}.each do \|field\|
112	141	enterprise.send("#{field}=", self.send(field))
113	142	end
114	143
115		- organization_data = self.data.reject do \|key,value\|
116		- profile_fields.include?(key.to_s)
117		- end
118		-
119	144	enterprise.environment = environment
120	145
121	146	enterprise.user = self.requestor.user
122	147
123		- enterprise.update_attributes(organization_data)
124	148	enterprise.save!
	149	+ enterprise.add_admin(enterprise.user.person)
125	150	end
126	151
127	152	def description
...	...
...	...	@@ -34,6 +34,8 @@ class Enterprise < Organization
34	34	organization_website
35	35	historic_and_current_context
36	36	activities_short_description
	37	+ acronym
	38	+ foundation_year
37	39	]
38	40
39	41	def self.fields
...	...	@@ -44,7 +46,7 @@ class Enterprise < Organization
44	46	super
45	47	self.required_fields.each do \|field\|
46	48	if self.send(field).blank?
47		- self.errors.add(field, _('%{fn} is mandatory'))
	49	+ self.errors.add(field, _("%{fn} can't be blank"))
48	50	end
49	51	end
50	52	end
...	...
...	...	@@ -89,6 +89,7 @@ class Environment < ActiveRecord::Base
89	89	'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
90	90	'disable_contact_person' => _('Disable contact for people'),
91	91	'disable_contact_community' => _('Disable contact for groups/communities'),
	92	+ 'disable_enterprise_registration' => _('Disable the enterprise registration'),
92	93	'join_community_popup' => _('Ask users to join a group/community with a popup'),
93	94
94	95	'enterprise_activation' => _('Enable activation of enterprises'),
...	...
...	...	@@ -14,6 +14,10 @@ class Region < Category
14	14	def has_validator?
15	15	validators.count > 0
16	16	end
	17	+
	18	+ def self.with_validators
	19	+ Region.find(:all, :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)')
	20	+ end
17	21
18	22	end
19	23
...	...
...	...	@@ -2,34 +2,34 @@
2	2
3	3	<h2><%= _('Register enterprise') %></h2>
4	4
5		-<h3> <%= _('How to proceed') %> </h3>
6		-<p> <%= _('Fill the form and hit the Register button then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state), when the enterprise is aproved you will be able to activate its profile') %> </p>
7		-
8		-<% labelled_form_for(:create_enterprise, @create_enterprise) do \|f\| %>
9		- <%= f.text_field 'identifier', 'size' => 20 %>
10		-
11		- <%= f.text_field 'name', 'size' => 20 %>
12		-
13		- <%= f.text_field 'address', 'size' => 50 %>
14		-
15		- <%= f.text_field 'contact_phone', 'size' => 20 %>
16		-
17		- <%= f.text_field 'contact_person', 'size' => 20 %>
18		-
19		- <%= f.text_field 'acronym', 'size' => 20 %>
20		-
21		- <%= f.text_field 'foundation_year', 'size' => 20 %>
22		-
23		- <%= f.text_field 'legal_form', 'size' => 20 %>
24		-
25		- <%= f.text_field 'economic_activity', 'size' => 20 %>
26		-
27		- <%= labelled_form_field(_('Management information'), text_editor('create_enterprise', 'management_information')) %>
28		-
29		- <%= labelled_form_field(_('Region'), f.select('region_id', @regions)) %>
	5	+
	6	+<% if @validation == :region && @regions.empty? %>
	7	+ <div class='atention'>
	8	+ <%= _('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
	9	+ </div>
30	10
31	11	<% button_bar do %>
32		- <%= submit_button('next', _('Next'), :cancel => {:action => 'index'}) %>
	12	+ <%= button :back, _('Go back'), { :profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile" }%>
	13	+ <% end %>
	14	+<% else %>
	15	+ <div class='atention'>
	16	+ <%= _('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.') %>
	17	+ </div>
	18	+
	19	+ <%= required_fields_message %>
	20	+
	21	+ <% labelled_form_for(:create_enterprise, @create_enterprise) do \|f\| %>
	22	+ <%= required f.text_field 'identifier'%>
	23	+ <%= required f.text_field 'name'%>
	24	+ <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %>
	25	+ <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
	26	+
	27	+ <% if @validation == :admin %>
	28	+ <%= hidden_field_tag 'create_enterprise[target_id]', environment.id %>
	29	+ <% end %>
	30	+
	31	+ <% button_bar do %>
	32	+ <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
	33	+ <% end %>
33	34	<% end %>
34		-
35	35	<% end %>
...	...
...	...	@@ -9,8 +9,7 @@
9	9
10	10	<% for validator in @validators %>
11	11	<div>
12		- <%= radio_button_tag('create_enterprise[target_id]', validator.id) %>
13		- <%= validator.name %>
	12	+ <%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id, true %>
14	13
15	14	<%= labelled_form_field(_('Validation Methodology:'), validator.validation_methodology \|\| _("(not informed)")) %>
16	15	<%= labelled_form_field(_('Restrictions (if any):'), validator.validation_restrictions \|\| _("(not informed)")) %>
...	...
...	...	@@ -4,6 +4,7 @@
4	4
5	5	<% button_bar do %>
6	6	<%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
	7	+ <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if !environment.enabled?('disable_enterprise_registration') %>
7	8	<%= button :back, _('Go back'), :controller => 'profile_editor' %>
8	9	<% end %>
9	10
...	...
...	...	@@ -12,8 +12,7 @@
12	12	<% button_bar do %>
13	13	<%= button :back, _('Go back'), { :controller => 'profile' },
14	14	:help => _('Back to the page where you come from.') %>
15		- <%= button :add, __('Register a new Enterprise'),
16		- :controller => 'enterprise_registration' if logged_in? %>
	15	+ <%= button :add, __('Register a new Enterprise'), :controller => 'enterprise_registration' if logged_in? && !environment.enabled?('disable_enterprise_registration') %>
17	16	<% end %>
18	17
19	18	</div><!-- fim class="common-profile-list-block" -->
...	...
1	1	<h2><%= _('General information') %></h2>
2	2
3		- <%= required_fields_message if @profile.required_fields.any? %>
	3	+ <%= required_fields_message %>
4	4
5	5	<%= required f.text_field(:name) %>
6	6
...	...	@@ -66,9 +66,6 @@
66	66	</div>
67	67	<% end %>
68	68
69		- <%= f.text_field(:acronym) %>
70		- <%= f.text_field(:foundation_year) %>
71		-
72	69	<%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile, :only_required => false } %>
73	70
74	71	<%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
...	...