ActionItem14: merging work done offline at João Pessoa. Keeping individual log m…

…essages below to reach this commit from their respective action items. r716@cabula: terceiro | 2007-10-15 16:42:10 +0000 creting local branch for trunk r717@cabula: terceiro | 2007-10-15 20:03:03 +0000 ActionItem14: working on the user interface for enterprise registration r724@cabula: terceiro | 2007-10-16 21:44:04 +0000 ActionItem85: adding script for downloading plugins when using svk r725@cabula: terceiro | 2007-10-16 22:58:38 +0000 ActionItem14: implementing helper method r726@cabula: terceiro | 2007-10-16 23:34:59 +0000 ActionItem14: making test more complete r727@cabula: terceiro | 2007-10-17 12:36:20 +0000 ActionItem85: commenting out unexisting javascript r728@cabula: terceiro | 2007-10-17 15:58:58 +0000 ActionItem14: implementing enterprise registration controller. Still missing some TODO items. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@716 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem14: merging work done offline at João Pessoa. Keeping individual log m…
…essages below to reach this commit from their respective action items. r716@cabula: terceiro | 2007-10-15 16:42:10 +0000 creting local branch for trunk r717@cabula: terceiro | 2007-10-15 20:03:03 +0000 ActionItem14: working on the user interface for enterprise registration r724@cabula: terceiro | 2007-10-16 21:44:04 +0000 ActionItem85: adding script for downloading plugins when using svk r725@cabula: terceiro | 2007-10-16 22:58:38 +0000 ActionItem14: implementing helper method r726@cabula: terceiro | 2007-10-16 23:34:59 +0000 ActionItem14: making test more complete r727@cabula: terceiro | 2007-10-17 12:36:20 +0000 ActionItem85: commenting out unexisting javascript r728@cabula: terceiro | 2007-10-17 15:58:58 +0000 ActionItem14: implementing enterprise registration controller. Still missing some TODO items. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@716 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 274fe395
Showing 14 changed files with 304 additions and 6 deletions Show diff stats
app/controllers/public/enterprise_registration_controller.rb
app/models/create_enterprise.rb
app/views/enterprise_registration/_hidden_fields.rhtml
app/views/enterprise_registration/basic_information.rhtml
app/views/enterprise_registration/confirmation.rhtml
app/views/enterprise_registration/select_validator.rhtml
app/views/layouts/application.rhtml
config/routes.rb
public/stylesheets/common.css
script/anhetegua
test/functional/enterprise_registration_controller_test.rb
test/integration/routing_test.rb
test/unit/create_enterprise_test.rb
vendor/plugins/update-externals.sh
@@ -0,0 +1,52 @@
+class EnterpriseRegistrationController < ApplicationController
+
+  # Just go to the first step.
+  # 
+  # FIXME: shouldn't this action present some sort of welcome message and point
+  # to the first step explicitly?
+  def index
+    @create_enterprise = CreateEnterprise.new(params[:create_enterprise])
+    @create_enterprise.requestor = current_user.person
+    the_action =
+      if request.post?
+        if @create_enterprise.valid_before_selecting_target?
+          if @create_enterprise.valid?
+            :confirmation
+          else
+            :select_validator
+          end
+        end
+      end
+
+    # default to basic_information
+    the_action ||= :basic_information
+
+    send(the_action)
+    render :action => the_action
+  end
+
+  protected
+
+  # Fill in the form and select your Region. 
+  #
+  # Posts back.
+  def basic_information
+    @regions = environment.regions.map {|item| [item.name, item.id]}
+  end
+
+  # present information about validator organizations, and the user one to
+  # validate her brand new enterprise.
+  #
+  # Posts back.
+  def select_validator
+    @validators = @create_enterprise.region.validators
+  end
+
+  # Actually records the enterprise registration request and presents a
+  # confirmation message saying to the user that the enterprise register
+  # request was done.
+  def confirmation
+    @create_enterprise.save!
+  end
+
+end
@@ -34,6 +34,14 @@ class CreateEnterprise &lt; Task
     end
   end
  
+  def valid_before_selecting_target?
+    if valid?
+      true
+    else
+      self.errors.size == 1 and self.errors[:target_id]
+    end
+  end
+
   # gets the associated region for the enterprise creation
   def region(reload = false)
     if self.region_id
@@ -0,0 +1,11 @@
+<%= hidden_field 'create_enterprise', 'identifier' %>
+<%= hidden_field 'create_enterprise', 'name' %>
+<%= hidden_field 'create_enterprise', 'address' %>
+<%= hidden_field 'create_enterprise', 'contact_phone' %>
+<%= hidden_field 'create_enterprise', 'contact_person' %>
+<%= hidden_field 'create_enterprise', 'acronym' %>
+<%= hidden_field 'create_enterprise', 'foundation_year' %>
+<%= hidden_field 'create_enterprise', 'legal_form' %>
+<%= hidden_field 'create_enterprise', 'economic_activity' %>
+<%= hidden_field 'create_enterprise', 'management_information' %>
+<%= hidden_field 'create_enterprise', 'region_id' %>
@@ -0,0 +1,36 @@
+<%= error_messages_for 'create_enterprise' %>
+
+<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')) %>
+
+  <%= f.select('region_id', @regions) %>
+
+  <div>
+    <%= submit_tag _('Register') %>
+    <%= link_to _('Cancel'), :action => 'index' %>
+  </div>
+
+<% end %>
@@ -0,0 +1,9 @@
+<h2><%= _('Enterprise Registration completed') %></h2>
+
+<p>
+<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %> 
+</p>
+
+<p>
+<%= link_to _('You can continue to browse this environment.'), :controller => 'home' %>
+</p>
@@ -0,0 +1,18 @@
+<h2><%= _('Enterprise Registration: Select a validator organization') %></h2>
+
+<p>
+<%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
+</p>
+
+<% form_tag do %>
+  <%= render :partial => 'hidden_fields' %>
+
+  <% for validator in @validators %>
+    <div>
+      <%= radio_button_tag('create_enterprise[target_id]', validator.id) %>
+      <%= validator.name %>
+    </div>
+  <% end %>
+
+  <%= submit_tag _('Confirm') %>
+<% end %>
@@ -3,7 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  
     <%= javascript_include_tag 'prototype' %>
-    <%= javascript_include_tag 'sweetTitles' %>
+    <%# javascript_include_tag 'sweetTitles' %>
     <%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
     <%= javascript_include_tag 'scriptaculous' %>
     <%= javascript_include_tag 'dragdrop' %>
@@ -22,7 +22,9 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password'
  
   map.connect 'account/:action', :controller => 'account'
- 
+
+  # enterprise registration
+  map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration'
  
   ######################################################
   ## Controllers that are profile-specific (for profile admins )
@@ -34,3 +34,29 @@ padding-left: 60px !important ;
 color: #dfdfdf !important ;
 }
  
+div.fieldWithErrors {
+  display: inline;
+  background: yellow;
+}
+
+div.fieldWithErrors input {
+  border: 1px solid red;
+  background: #fee;
+}
+
+div#errorExplanation {
+  border: 2px solid #933;
+  background: #fee;
+  padding: 5px;
+}
+
+div#errorExplanation h2 {
+  margin-top: -5px;
+  margin-left: -5px;
+  margin-right: -5px;
+
+  padding: 3px;
+  background: #933;
+  color: white;
+  text-align: center;
+}
@@ -9,16 +9,34 @@ def new_category(parent, name, color = nil)
   category
 end
  
+def new_region(parent, name, color = nil)
+  region = Environment.default.regions.build(:name => name, :display_color => color, :parent_id => (parent ? parent.id: nil))
+  region.save!
+  region
+end
+
 tematicas = new_category(nil, 'Temáticas', 1)
 new_category(tematicas, 'Finanças Solidárias')
 new_category(tematicas, 'Marco Legal')
 new_category(tematicas, 'Software Livre')
  
-territorios = new_category(nil, 'Territórios', 2)
-new_category(territorios, 'Bahia')
-new_category(territorios, 'Distrito Federal')
-new_category(territorios, 'Rio Grande do Sul')
+territorios = new_region(nil, 'Territórios', 2)
+ba = new_region(territorios, 'Bahia')
+df = new_region(territorios, 'Distrito Federal')
+rs = new_region(territorios, 'Rio Grande do Sul')
  
 cadeias = new_category(nil, 'Cadeias', 3)
 new_category(cadeias, 'Algodão')
 new_category(cadeias, 'Tecnologia de Informação')
+
+
+# validators
+ba.validators << Organization.create!(:name => "Colivre", :identifier => 'colivre')
+ba.validators << Organization.create!(:name => "Forum Baiano de Economia Solidaraia", :identifier => 'ecosolbahia')
+
+df.validators << Organization.create!(:name => 'Caritas', :identifier => 'caritas')
+df.validators << Organization.create!(:name => 'Forum Brasileiro de Economia Solidaria', :identifier => 'fbes')
+
+rs.validators << Organization.create!(:name => 'Associacao Software Livre.Org', :identifier => 'asl')
+rs.validators << Organization.create!(:name => 'Forum Gaucho de Economia Solidaria', :identifier => 'ecosolrs')
+
@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'enterprise_registration_controller'
+
+# Re-raise errors caught by the controller.
+class EnterpriseRegistrationController; def rescue_action(e) raise e end; end
+
+class EnterpriseRegistrationControllerTest < Test::Unit::TestCase
+
+  fixtures :users
+
+  def setup
+    @controller = EnterpriseRegistrationController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    login_as 'ze'
+  end
+
+  should 'go to the first step on index' do
+    get :index
+    assert_response :success
+    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
+    data = { 'name' => 'My new enterprise', 'identifier' => 'mynew' }
+
+    create_enterprise = CreateEnterprise.new
+    CreateEnterprise.expects(:new).with(data).returns(create_enterprise)
+
+    validator1 = mock()
+    validator1.expects(:id).returns(1)
+    validator1.expects(:name).returns("validator1")
+    validator2 = mock()
+    validator2.expects(:id).returns(2)
+    validator2.expects(:name).returns("validator2")
+    region = mock()
+    region.expects(:validators).returns([validator1, validator2]).at_least_once
+    create_enterprise.expects(:region).returns(region)
+
+    # all data but validator selected
+    create_enterprise.expects(:valid_before_selecting_target?).returns(true)
+    create_enterprise.expects(:valid?).returns(false) 
+
+    post :index, :create_enterprise => data
+    assert_template 'select_validator'
+  end
+
+  should 'provide confirmation at the end of the process' do
+    data = { 'name' => 'My new enterprise', 'identifier' => 'mynew' }
+
+    create_enterprise = CreateEnterprise.new
+    CreateEnterprise.expects(:new).with(data).returns(create_enterprise)
+
+    # all including validator selected
+    validator = mock()
+    validator.stubs(:name).returns("lalala")
+    create_enterprise.expects(:valid_before_selecting_target?).returns(true)
+    create_enterprise.expects(:valid?).returns(true) # validator already selected
+    create_enterprise.expects(:save!)
+    create_enterprise.expects(:target).returns(validator)
+
+    post :index, :create_enterprise => data
+    assert_template 'confirmation'
+  end
+
+end
@@ -21,6 +21,10 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/account', :controller => 'account', :action => 'index')
   end
  
+  def test_enterprise_registration_controller
+    assert_routing('/enterprise_registration', :controller => 'enterprise_registration', :action => 'index')
+  end
+
   def test_new_password
     assert_routing('/account/new_password/90dfhga7sadgd0as6saas', :controller => 'account', :action => 'new_password', :code => '90dfhga7sadgd0as6saas')
   end
@@ -115,4 +115,29 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
     end
   end
  
+  should 'validate that eveything is ok but the validator (target)' do
+    Environment.destroy_all
+    environment = Environment.create!(:name => "My environment", :contact_email => 'test@localhost.localdomain', :is_default => true)
+    region = Region.create!(:name => 'My region', :environment_id => environment.id)
+    validator = Organization.create!(:name => "My organization", :identifier => 'myorg', :environment_id => environment.id)
+    region.validators << validator
+    person = User.create!(:login => 'testuser', :password => 'test', :password_confirmation => 'test', :email => 'testuser@localhost.localdomain').person
+    task = CreateEnterprise.new({
+      :name => 'My new enterprise',
+      :identifier => 'mynewenterprise',
+      :address => 'satan street, 666',
+      :contact_phone => '1298372198',
+      :contact_person => 'random joe',
+      :legal_form => 'cooperative',
+      :economic_activity => 'free software',
+      :region_id => region.id,
+      :requestor_id => person.id,
+    })
+
+    assert !task.valid? && task.valid_before_selecting_target?
+
+    task.target = validator
+    assert task.valid?
+  end
+
 end
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# this script can be used when using svk, since svk does not support automatic
+# checkout of svn's svn:externals. Then if you use svk, change to
+# vendor/plugins directory and run this script with `sh update-externals.sh`
+
+svk propget svn:externals . | awk '{ if ($1) print "if [ -e " $1 " ]; then svn update " $1 "; else svn co " $2 " " $1 "; fi"}' | sh
...	...	@@ -0,0 +1,52 @@
	1	+class EnterpriseRegistrationController < ApplicationController
	2	+
	3	+ # Just go to the first step.
	4	+ #
	5	+ # FIXME: shouldn't this action present some sort of welcome message and point
	6	+ # to the first step explicitly?
	7	+ def index
	8	+ @create_enterprise = CreateEnterprise.new(params[:create_enterprise])
	9	+ @create_enterprise.requestor = current_user.person
	10	+ the_action =
	11	+ if request.post?
	12	+ if @create_enterprise.valid_before_selecting_target?
	13	+ if @create_enterprise.valid?
	14	+ :confirmation
	15	+ else
	16	+ :select_validator
	17	+ end
	18	+ end
	19	+ end
	20	+
	21	+ # default to basic_information
	22	+ the_action \|\|= :basic_information
	23	+
	24	+ send(the_action)
	25	+ render :action => the_action
	26	+ end
	27	+
	28	+ protected
	29	+
	30	+ # Fill in the form and select your Region.
	31	+ #
	32	+ # Posts back.
	33	+ def basic_information
	34	+ @regions = environment.regions.map {\|item\| [item.name, item.id]}
	35	+ end
	36	+
	37	+ # present information about validator organizations, and the user one to
	38	+ # validate her brand new enterprise.
	39	+ #
	40	+ # Posts back.
	41	+ def select_validator
	42	+ @validators = @create_enterprise.region.validators
	43	+ end
	44	+
	45	+ # Actually records the enterprise registration request and presents a
	46	+ # confirmation message saying to the user that the enterprise register
	47	+ # request was done.
	48	+ def confirmation
	49	+ @create_enterprise.save!
	50	+ end
	51	+
	52	+end
...	...
...	...	@@ -34,6 +34,14 @@ class CreateEnterprise < Task
34	34	end
35	35	end
36	36
	37	+ def valid_before_selecting_target?
	38	+ if valid?
	39	+ true
	40	+ else
	41	+ self.errors.size == 1 and self.errors[:target_id]
	42	+ end
	43	+ end
	44	+
37	45	# gets the associated region for the enterprise creation
38	46	def region(reload = false)
39	47	if self.region_id
...	...
...	...	@@ -0,0 +1,11 @@
	1	+<%= hidden_field 'create_enterprise', 'identifier' %>
	2	+<%= hidden_field 'create_enterprise', 'name' %>
	3	+<%= hidden_field 'create_enterprise', 'address' %>
	4	+<%= hidden_field 'create_enterprise', 'contact_phone' %>
	5	+<%= hidden_field 'create_enterprise', 'contact_person' %>
	6	+<%= hidden_field 'create_enterprise', 'acronym' %>
	7	+<%= hidden_field 'create_enterprise', 'foundation_year' %>
	8	+<%= hidden_field 'create_enterprise', 'legal_form' %>
	9	+<%= hidden_field 'create_enterprise', 'economic_activity' %>
	10	+<%= hidden_field 'create_enterprise', 'management_information' %>
	11	+<%= hidden_field 'create_enterprise', 'region_id' %>
...	...
...	...	@@ -0,0 +1,36 @@
	1	+<%= error_messages_for 'create_enterprise' %>
	2	+
	3	+<h2><%= _('Register enterprise') %></h2>
	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	+ <%= f.select('region_id', @regions) %>
	30	+
	31	+ <div>
	32	+ <%= submit_tag _('Register') %>
	33	+ <%= link_to _('Cancel'), :action => 'index' %>
	34	+ </div>
	35	+
	36	+<% end %>
...	...
...	...	@@ -0,0 +1,9 @@
	1	+<h2><%= _('Enterprise Registration completed') %></h2>
	2	+
	3	+<p>
	4	+<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
	5	+</p>
	6	+
	7	+<p>
	8	+<%= link_to _('You can continue to browse this environment.'), :controller => 'home' %>
	9	+</p>
...	...
...	...	@@ -0,0 +1,18 @@
	1	+<h2><%= _('Enterprise Registration: Select a validator organization') %></h2>
	2	+
	3	+<p>
	4	+<%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
	5	+</p>
	6	+
	7	+<% form_tag do %>
	8	+ <%= render :partial => 'hidden_fields' %>
	9	+
	10	+ <% for validator in @validators %>
	11	+ <div>
	12	+ <%= radio_button_tag('create_enterprise[target_id]', validator.id) %>
	13	+ <%= validator.name %>
	14	+ </div>
	15	+ <% end %>
	16	+
	17	+ <%= submit_tag _('Confirm') %>
	18	+<% end %>
...	...
...	...	@@ -3,7 +3,7 @@
3	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
4	4
5	5	<%= javascript_include_tag 'prototype' %>
6		- <%= javascript_include_tag 'sweetTitles' %>
	6	+ <%# javascript_include_tag 'sweetTitles' %>
7	7	<%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
8	8	<%= javascript_include_tag 'scriptaculous' %>
9	9	<%= javascript_include_tag 'dragdrop' %>
...	...
...	...	@@ -22,7 +22,9 @@ ActionController::Routing::Routes.draw do \|map\|
22	22	map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password'
23	23
24	24	map.connect 'account/:action', :controller => 'account'
25		-
	25	+
	26	+ # enterprise registration
	27	+ map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration'
26	28
27	29	######################################################
28	30	## Controllers that are profile-specific (for profile admins )
...	...
...	...	@@ -34,3 +34,29 @@ padding-left: 60px !important ;
34	34	color: #dfdfdf !important ;
35	35	}
36	36
	37	+div.fieldWithErrors {
	38	+ display: inline;
	39	+ background: yellow;
	40	+}
	41	+
	42	+div.fieldWithErrors input {
	43	+ border: 1px solid red;
	44	+ background: #fee;
	45	+}
	46	+
	47	+div#errorExplanation {
	48	+ border: 2px solid #933;
	49	+ background: #fee;
	50	+ padding: 5px;
	51	+}
	52	+
	53	+div#errorExplanation h2 {
	54	+ margin-top: -5px;
	55	+ margin-left: -5px;
	56	+ margin-right: -5px;
	57	+
	58	+ padding: 3px;
	59	+ background: #933;
	60	+ color: white;
	61	+ text-align: center;
	62	+}
...	...
...	...	@@ -9,16 +9,34 @@ def new_category(parent, name, color = nil)
9	9	category
10	10	end
11	11
	12	+def new_region(parent, name, color = nil)
	13	+ region = Environment.default.regions.build(:name => name, :display_color => color, :parent_id => (parent ? parent.id: nil))
	14	+ region.save!
	15	+ region
	16	+end
	17	+
12	18	tematicas = new_category(nil, 'Temáticas', 1)
13	19	new_category(tematicas, 'Finanças Solidárias')
14	20	new_category(tematicas, 'Marco Legal')
15	21	new_category(tematicas, 'Software Livre')
16	22
17		-territorios = new_category(nil, 'Territórios', 2)
18		-new_category(territorios, 'Bahia')
19		-new_category(territorios, 'Distrito Federal')
20		-new_category(territorios, 'Rio Grande do Sul')
	23	+territorios = new_region(nil, 'Territórios', 2)
	24	+ba = new_region(territorios, 'Bahia')
	25	+df = new_region(territorios, 'Distrito Federal')
	26	+rs = new_region(territorios, 'Rio Grande do Sul')
21	27
22	28	cadeias = new_category(nil, 'Cadeias', 3)
23	29	new_category(cadeias, 'Algodão')
24	30	new_category(cadeias, 'Tecnologia de Informação')
	31	+
	32	+
	33	+# validators
	34	+ba.validators << Organization.create!(:name => "Colivre", :identifier => 'colivre')
	35	+ba.validators << Organization.create!(:name => "Forum Baiano de Economia Solidaraia", :identifier => 'ecosolbahia')
	36	+
	37	+df.validators << Organization.create!(:name => 'Caritas', :identifier => 'caritas')
	38	+df.validators << Organization.create!(:name => 'Forum Brasileiro de Economia Solidaria', :identifier => 'fbes')
	39	+
	40	+rs.validators << Organization.create!(:name => 'Associacao Software Livre.Org', :identifier => 'asl')
	41	+rs.validators << Organization.create!(:name => 'Forum Gaucho de Economia Solidaria', :identifier => 'ecosolrs')
	42	+
...	...