From 8a59c91b92cc2ba54664cd2509f393b2e2aaddc9 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Mon, 10 Jan 2011 11:21:17 -0300
Subject: [PATCH] Removing category_types method from environment. It's not needed anymore.

---
 app/helpers/categories_helper.rb    |  3 +--
 app/models/environment.rb           |  1 -
 app/views/categories/_form.rhtml    |  4 ----
 test/unit/categories_helper_test.rb | 11 -----------
 test/unit/environment_test.rb       | 11 -----------
 5 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb
index 1605b91..6350496 100644
--- a/app/helpers/categories_helper.rb
+++ b/app/helpers/categories_helper.rb
@@ -34,8 +34,7 @@ module CategoriesHelper
 
   def select_category_type(field)
     value = params[field]
-    types = TYPES.select { |title,typename| environment.category_types.include?(typename) }
-    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(types, value)))
+    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
 
 end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 34cc7fe..659558b 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -207,7 +207,6 @@ class Environment < ActiveRecord::Base
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
   settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
-  settings_items :category_types, :type => Array, :default => ['Category']
   settings_items :enable_ssl
   settings_items :local_docs, :type => Array, :default => []
   settings_items :news_amount_by_folder, :type => Integer, :default => 4
diff --git a/app/views/categories/_form.rhtml b/app/views/categories/_form.rhtml
index 829dcc7..4eee4be 100644
--- a/app/views/categories/_form.rhtml
+++ b/app/views/categories/_form.rhtml
@@ -9,11 +9,7 @@
       <%= hidden_field_tag('parent_id', @category.parent.id) %>
       <%= hidden_field_tag('parent_type', @category.parent.class.name) %>
     <% else %>
-      <% if environment.category_types.length > 1 %>
         <%= select_category_type :type %>
-      <% else %>
-        <%= hidden_field_tag('type', @category.class.name) %>
-      <% end%>
     <% end %>
   <% end %>
 
diff --git a/test/unit/categories_helper_test.rb b/test/unit/categories_helper_test.rb
index cb62749..885c76b 100644
--- a/test/unit/categories_helper_test.rb
+++ b/test/unit/categories_helper_test.rb
@@ -11,7 +11,6 @@ class CategoriesHelperTest < Test::Unit::TestCase
   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')
@@ -20,14 +19,4 @@ class CategoriesHelperTest < Test::Unit::TestCase
     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
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 9560797..a76608c 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -731,17 +731,6 @@ class EnvironmentTest < Test::Unit::TestCase
     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
-
   should 'has tasks' do
     e = Environment.default
     assert_nothing_raised do
--
libgit2 0.21.2