Added an option to make a environment private

Victor Costa
1 parent d4f22713
Showing 3 changed files with 14 additions and 1 deletions Show diff stats
app/controllers/application_controller.rb
app/models/environment.rb
test/functional/application_controller_test.rb
@@ -4,6 +4,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :detect_stuff_by_domain
   before_filter :init_noosfero_plugins_controller_filters
   before_filter :allow_cross_domain_access
+  before_filter :login_required, :if => :private_environment?
  
   def allow_cross_domain_access
     origin = request.headers['Origin']
@@ -190,4 +191,8 @@ class ApplicationController &lt; ActionController::Base
     {:results => scope.paginate(paginate_options)}
   end
  
+  def private_environment?
+    @environment.enabled?(:restrict_to_members)
+  end
+
 end
@@ -130,7 +130,8 @@ class Environment &lt; ActiveRecord::Base
       'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
       'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
       'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
-      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
+      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage'),
+      'restrict_to_members' => _('Show content only to members')
     }
   end
  
@@ -574,4 +574,11 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'meta', :attributes => { :property => 'article:published_time' }
     assert_no_tag :tag => 'meta', :attributes => { :property => 'og:image' }
   end
+
+  should 'redirect to login if environment is restrict to members' do
+    Environment.default.enable(:restrict_to_members)
+    get :index
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
 end
...	...	@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
4	4	before_filter :detect_stuff_by_domain
5	5	before_filter :init_noosfero_plugins_controller_filters
6	6	before_filter :allow_cross_domain_access
	7	+ before_filter :login_required, :if => :private_environment?
7	8
8	9	def allow_cross_domain_access
9	10	origin = request.headers['Origin']
...	...	@@ -190,4 +191,8 @@ class ApplicationController < ActionController::Base
190	191	{:results => scope.paginate(paginate_options)}
191	192	end
192	193
	194	+ def private_environment?
	195	+ @environment.enabled?(:restrict_to_members)
	196	+ end
	197	+
193	198	end
...	...
...	...	@@ -130,7 +130,8 @@ class Environment < ActiveRecord::Base
130	130	'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
131	131	'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
132	132	'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
133		- 'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
	133	+ 'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage'),
	134	+ 'restrict_to_members' => _('Show content only to members')
134	135	}
135	136	end
136	137
...	...
...	...	@@ -574,4 +574,11 @@ class ApplicationControllerTest < ActionController::TestCase
574	574	assert_no_tag :tag => 'meta', :attributes => { :property => 'article:published_time' }
575	575	assert_no_tag :tag => 'meta', :attributes => { :property => 'og:image' }
576	576	end
	577	+
	578	+ should 'redirect to login if environment is restrict to members' do
	579	+ Environment.default.enable(:restrict_to_members)
	580	+ get :index
	581	+ assert_redirected_to :controller => 'account', :action => 'login'
	582	+ end
	583	+
577	584	end
...	...