Merge remote branch 'larissa/makes-my-community-opicional'

Daniela Feitosa
2 parents 223c8d39 da23338a
Showing 3 changed files with 18 additions and 11 deletions Show diff stats
app/helpers/application_helper.rb
app/models/environment.rb
test/functional/profile_controller_test.rb
@@ -1134,12 +1134,12 @@ module ApplicationHelper
   end
   def manage_enterprises
-    return if not user
+    return unless user
     manage_link(user.enterprises, :enterprises)
   end
   def manage_communities
-    return if not user
+    return unless user && !user.environment.enabled?('disable_my_communities_menu')
     administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
     manage_link(administered_communities, :communities)
   end
@@ -97,6 +97,7 @@ class Environment &lt; ActiveRecord::Base
       'disable_asset_events' => _('Disable search for events'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
+      'disable_my_communities_menu' => _('Disable My Communities menu'),
       'disable_gender_icon' => _('Disable gender icon'),
       'disable_categories_menu' => _('Disable the categories menu'),
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
@@ -17,11 +17,11 @@ class ProfileControllerTest &lt; ActionController::TestCase
   def test_local_files_reference
     assert_local_files_reference
   end
-  
+
   def test_valid_xhtml
     assert_valid_xhtml
   end
-  
+
   noosfero_test :profile => 'testuser'
   should 'list friends' do
@@ -68,7 +68,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_template 'members'
     assert_kind_of Array, assigns(:members)
   end
-  
+
   should 'list favorite enterprises' do
     get :favorite_enterprises
@@ -318,7 +318,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     get :profile_info, :profile => 'my-test-enterprise', :block_id => block.id
     assert_no_match /\/contact\/my-test-enterprise\/new/, @response.body
   end
-  
+
   should 'display contact button only if friends' do
     friend = create_user_full('friend_user').person
     friend.user.activate
@@ -1091,7 +1091,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     person = fast_create(Person)
     at = fast_create(ActionTracker::Record, :user_id => person.id)
-    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id) 
+    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     get :index, :profile => person.identifier
     assert_no_tag :tag => 'div', :attributes => {:id => 'profile-network'}
@@ -1103,7 +1103,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should "not show the scrap button on network activity if the user is himself" do
     login_as(profile.identifier)
     at = fast_create(ActionTracker::Record, :user_id => profile.id)
-    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id) 
+    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     get :index, :profile => profile.identifier
     assert_no_tag :tag => 'p', :attributes => {:class => 'profile-network-send-message'}
   end
@@ -1131,7 +1131,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     at = fast_create(ActionTracker::Record, :user_id => profile.id)
     profile.public_profile=false
     profile.save
-    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id) 
+    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     get :index, :profile => profile.identifier
     assert_equal [at], profile.tracked_actions
     assert_no_tag :tag => 'li', :attributes => {:id => "profile-activity-item-#{atn.id}"}
@@ -1276,7 +1276,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     get :index, :profile => profile.identifier
-    assert_tag :tag => 'p', :content => 'A scrap', :attributes => { :class => 'profile-activity-text'} 
+    assert_tag :tag => 'p', :content => 'A scrap', :attributes => { :class => 'profile-activity-text'}
     assert_tag :tag => 'div', :attributes => { :class => 'profile-activity-lead' }, :descendant => { :tag => 'a', :content => 'An article about free software' }
   end
@@ -1549,7 +1549,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'td', :content => 'e-Mail:'
   end
-  should 'build menu to the community panel' do
+  should 'build menu to the community panel if enabled' do
     u = create_user('other_other_ze').person
     u2 = create_user('guy_that_will_be_admin_of_all').person # because the first member of each community is an admin
     Environment.any_instance.stubs(:required_person_fields).returns([])
@@ -1582,6 +1582,12 @@ class ProfileControllerTest &lt; ActionController::TestCase
       assert_no_match /community_3/, links.to_s
       assert_no_match /community_4/, links.to_s
     end
+
+    Environment.any_instance.stubs(:enabled?).returns(false)
+    Environment.any_instance.stubs(:enabled?).with('disable_my_communities_menu').returns(true)
+
+    get :index
+    assert_no_tag :tag => 'div', :attributes => {:id => 'manage-communities'}
   end
   should 'build menu to the enterprise panel' do
	@@ -1134,12 +1134,12 @@ module ApplicationHelper		@@ -1134,12 +1134,12 @@ module ApplicationHelper
1134	end	1134	end
1135		1135
1136	def manage_enterprises	1136	def manage_enterprises
1137	- return if not user	1137	+ return unless user
1138	manage_link(user.enterprises, :enterprises)	1138	manage_link(user.enterprises, :enterprises)
1139	end	1139	end
1140		1140
1141	def manage_communities	1141	def manage_communities
1142	- return if not user	1142	+ return unless user && !user.environment.enabled?('disable_my_communities_menu')
1143	administered_communities = user.communities.more_popular.select {\|c\| c.admins.include? user}	1143	administered_communities = user.communities.more_popular.select {\|c\| c.admins.include? user}
1144	manage_link(administered_communities, :communities)	1144	manage_link(administered_communities, :communities)
1145	end	1145	end