ActionItem834: port ecosol-specific changes into master branch

* renaming ferret_server.yml to ferret_server.yml.dist * adding workaround to list categories * hack to bypass ferret limitation * adding configuration to better-browse-promotion * adding form for enterprise activation

ActionItem834: port ecosol-specific changes into master branch
* renaming ferret_server.yml to ferret_server.yml.dist * adding workaround to list categories * hack to bypass ferret limitation * adding configuration to better-browse-promotion * adding form for enterprise activation
Daniela Feitosa · Antonio Terceiro
1 parent 32e3c06e
Showing 12 changed files with 104 additions and 29 deletions Show diff stats
app/controllers/admin/categories_controller.rb
app/models/environment.rb
app/views/home/index.rhtml
app/views/layouts/application.rhtml
config/ferret_server.yml
config/ferret_server.yml.dist
lib/acts_as_searchable.rb
lib/unifreire_terminology.rb
lib/zen3_terminology.rb
public/stylesheets/blocks/main-block.css
test/functional/categories_controller_test.rb
test/functional/home_controller_test.rb
@@ -5,7 +5,9 @@ class CategoriesController &lt; AdminController
   helper :categories
   def index
-    @categories = environment.top_level_categories
+    # WORKAROUND: restricting the category trees to display. Region and
+    # ProductCategory have VERY LARGE trees.
+    @categories = environment.categories.find(:all, :conditions => "parent_id is null AND type is null")
   end
   ALLOWED_TYPES = CategoriesHelper::TYPES.map {|item| item[1] }
@@ -40,6 +40,9 @@ class Environment &lt; ActiveRecord::Base
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
       'disable_join_community_popup' => _('Disable the popup that ask to join a group/community'),
+
+      'enterprise_activation' => _('Enable activation of enterprises'),
+      'warn_obsolete_browser' => _('Enable warning of obsolete browser'),
     }
   end
-<%= @environment.description %>
+<%= environment.description %>
+
+<% if environment.enabled?('enterprise_activation') %>
+
+    <div id='activation_enterprise'>
+    <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
+      <p><strong><%= __('Activate your enterprise') %></strong></p>
+      <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %>
+      <%= submit_button(:ok, _('Ativar')) %>
+    <% end %>
+  </div>
+
+<% end %>
 <div id='home-search' style='text-align: center'>
   <% form_tag :controller => 'search', :action => 'index' do %>
@@ -183,15 +183,19 @@
     <%= javascript_include_tag 'show-mouse-help' %>
     <%= javascript_include_tag 'noosfero-show-help' %>
-    <div id="better-browser-promotion" style="display:none">
-      <h3><%=
-      _('Your web browser is obsolete!') +'</h3><p/>'+
-      _('This website will not look as good as it could.
-         Don\'t you want to use Firefox? That is a great web browser, free,
-         and made by people of all the world parts.')
-      %><p/>
-      <b id="bbp-getff"><a href="http://getfirefox.com" class="icon-firefox" target="getff"><%= _('Get Firefox Now!') %></a></b>
-    </div>
+    <% if environment.enabled?('warn_obsolete_browser') %>
+
+      <div id="better-browser-promotion" style="display:none">
+        <h3><%=
+        _('Your web browser is obsolete!') +'</h3><p/>'+
+        _('This website will not look as good as it could.
+           Don\'t you want to use Firefox? That is a great web browser, free,
+           and made by people of all the world parts.')
+        %><p/>
+        <b id="bbp-getff"><a href="http://getfirefox.com" class="icon-firefox" target="getff"><%= _('Get Firefox Now!') %></a></b>
+      </div>
+
+    <% end %>
     <%= javascript_include_tag 'better-browser-promotion' %>
     <% if is_testing_theme %>
@@ -1,16 +0,0 @@
-production:
-  host: localhost
-  port: 9011
-  pid_file: log/ferret.pid
-#development:
-#  host: localhost
-#  port: 9010
-#  pid_file: log/ferret.pid
-#test:
-#  host: localhost
-#  port: 9009
-#  pid_file: log/ferret.pid
-staging:
-  host: localhost
-  port: 9011
-  pid_file: log/ferret.pid
@@ -0,0 +1,16 @@
+production:
+  host: localhost
+  port: 9011
+  pid_file: log/ferret.pid
+#development:
+#  host: localhost
+#  port: 9010
+#  pid_file: log/ferret.pid
+#test:
+#  host: localhost
+#  port: 9009
+#  pid_file: log/ferret.pid
+staging:
+  host: localhost
+  port: 9011
+  pid_file: log/ferret.pid
@@ -12,7 +12,9 @@ class &lt;&lt; ActiveRecord::Base
       ferret_options[:limit] = :all
-      ids = find_ids_with_ferret(query, ferret_options)[1].map{|r|r[:id].to_i}
+      # FIXME this is a HORRIBLE HACK
+      ids = find_ids_with_ferret(query, ferret_options)[1][0..8000].map{|r|r[:id].to_i}
+
       if ids.empty?
         ids << -1
       end
@@ -30,6 +30,9 @@ class UnifreireTerminology &lt; Noosfero::Terminology::Custom
       'Events' => N_('Schedule'),
       'Manage enterprise fields' => N_('Manage institutions fields'),
       "%s's enterprises" => N_("%s's institutions"),
+      'Activate your enterprise' => N_('Activate your institution'),
+      'Enterprise activation code' => N_('Institution activation code'),
+      'Disable activation of enterprises' => N_('Disable activation of institutions'),
     })
   end
@@ -60,6 +60,9 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
       'Friends' => N_('Contacts'),
       'Creating new community' => N_('Creating new group'),
       'Do you want to join this community?' => N_('Do you want to join this group?'),
+      'Activate your enterprise' => N_('Activate your organization'),
+      'Enterprise activation code' => N_('Organization activation code'),
+      'Disable activation of enterprises' => N_('Disable activation of organizations'),
     })
   end
@@ -5,3 +5,20 @@
 .main-block .article-body, .main-block h1 {
   overflow: hidden;
 }
+
+body div#activation_enterprise {
+  text-align: center;
+}
+
+div#activation_enterprise {
+  border: 2px solid #DA3;
+  padding-bottom: 10px;
+  margin-bottom: 15px;
+  background-color: #FD8;
+}
+
+div#activation_enterprise label,
+div#activation_enterprise input,
+div#activation_enterprise div {
+  display: inline
+}
@@ -174,4 +174,15 @@ class CategoriesControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'select', :attributes => { :name => "type" }
   end
+
+  should 'not list regions and product categories' do
+    Environment.default.categories.destroy_all
+    c = Category.create!(:name => 'Regular category', :environment => Environment.default)
+    ProductCategory.create!(:name => 'Product category', :environment => Environment.default)
+    Region.create!(:name => 'Some region', :environment => Environment.default)
+
+    get :index
+    assert_equal [c], assigns(:categories)
+  end
+
 end
@@ -21,5 +21,23 @@ all_fixtures
   def test_valid_xhtml
     assert_valid_xhtml
   end
-  
+
+  should 'not display form for enterprise activation if disabled in environment' do
+    env = Environment.default
+    env.disable('enterprise_activation')
+    env.save!
+
+    get :index
+    assert_no_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
+  end
+
+  should 'display form for enterprise activation if enabled on environment' do
+    env = Environment.default
+    env.enable('enterprise_activation')
+    env.save!
+
+    get :index
+    assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
+  end
+
 end
1	-<%= @environment.description %>	1	+<%= environment.description %>
		2	+
		3	+<% if environment.enabled?('enterprise_activation') %>
		4	+
		5	+ <div id='activation_enterprise'>
		6	+ <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
		7	+ <p><strong><%= __('Activate your enterprise') %></strong></p>
		8	+ <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %>
		9	+ <%= submit_button(:ok, _('Ativar')) %>
		10	+ <% end %>
		11	+ </div>
		12	+
		13	+<% end %>
2		14
3	<div id='home-search' style='text-align: center'>	15	<div id='home-search' style='text-align: center'>
4	<% form_tag :controller => 'search', :action => 'index' do %>	16	<% form_tag :controller => 'search', :action => 'index' do %>
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
1	-production:
2	- host: localhost
3	- port: 9011
4	- pid_file: log/ferret.pid
5	-#development:
6	-# host: localhost
7	-# port: 9010
8	-# pid_file: log/ferret.pid
9	-#test:
10	-# host: localhost
11	-# port: 9009
12	-# pid_file: log/ferret.pid
13	-staging:
14	- host: localhost
15	- port: 9011
16	- pid_file: log/ferret.pid
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+production:
	2	+ host: localhost
	3	+ port: 9011
	4	+ pid_file: log/ferret.pid
	5	+#development:
	6	+# host: localhost
	7	+# port: 9010
	8	+# pid_file: log/ferret.pid
	9	+#test:
	10	+# host: localhost
	11	+# port: 9009
	12	+# pid_file: log/ferret.pid
	13	+staging:
	14	+ host: localhost
	15	+ port: 9011
	16	+ pid_file: log/ferret.pid
	@@ -5,3 +5,20 @@		@@ -5,3 +5,20 @@
5	.main-block .article-body, .main-block h1 {	5	.main-block .article-body, .main-block h1 {
6	overflow: hidden;	6	overflow: hidden;
7	}	7	}
		8	+
		9	+body div#activation_enterprise {
		10	+ text-align: center;
		11	+}
		12	+
		13	+div#activation_enterprise {
		14	+ border: 2px solid #DA3;
		15	+ padding-bottom: 10px;
		16	+ margin-bottom: 15px;
		17	+ background-color: #FD8;
		18	+}
		19	+
		20	+div#activation_enterprise label,
		21	+div#activation_enterprise input,
		22	+div#activation_enterprise div {
		23	+ display: inline
		24	+}
	@@ -174,4 +174,15 @@ class CategoriesControllerTest < Test::Unit::TestCase		@@ -174,4 +174,15 @@ class CategoriesControllerTest < Test::Unit::TestCase
174		174
175	assert_tag :tag => 'select', :attributes => { :name => "type" }	175	assert_tag :tag => 'select', :attributes => { :name => "type" }
176	end	176	end
		177	+
		178	+ should 'not list regions and product categories' do
		179	+ Environment.default.categories.destroy_all
		180	+ c = Category.create!(:name => 'Regular category', :environment => Environment.default)
		181	+ ProductCategory.create!(:name => 'Product category', :environment => Environment.default)
		182	+ Region.create!(:name => 'Some region', :environment => Environment.default)
		183	+
		184	+ get :index
		185	+ assert_equal [c], assigns(:categories)
		186	+ end
		187	+
177	end	188	end
	@@ -21,5 +21,23 @@ all_fixtures		@@ -21,5 +21,23 @@ all_fixtures
21	def test_valid_xhtml	21	def test_valid_xhtml
22	assert_valid_xhtml	22	assert_valid_xhtml
23	end	23	end
24	-	24	+
		25	+ should 'not display form for enterprise activation if disabled in environment' do
		26	+ env = Environment.default
		27	+ env.disable('enterprise_activation')
		28	+ env.save!
		29	+
		30	+ get :index
		31	+ assert_no_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
		32	+ end
		33	+
		34	+ should 'display form for enterprise activation if enabled on environment' do
		35	+ env = Environment.default
		36	+ env.enable('enterprise_activation')
		37	+ env.save!
		38	+
		39	+ get :index
		40	+ assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
		41	+ end
		42	+
25	end	43	end