Download as
Browse Code »

Commit c3ee273285cbaab0e787755321383abbba562498

Authored by Antonio Terceiro
1 parent dc8aa572
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Do not say "n enteprises" if they are disabled 

ActionItem1598
Showing 2 changed files with 16 additions and 5 deletions   Show diff stats
app/models/environment_statistics_block.rb
  Diff comments   View file @c3ee273
@@ -17,11 +17,12 @@ class EnvironmentStatisticsBlock < Block @@ -17,11 +17,12 @@ class EnvironmentStatisticsBlock < Block
17 enterprises = owner.enterprises.visible.count 17 enterprises = owner.enterprises.visible.count
18 communities = owner.communities.visible.count 18 communities = owner.communities.visible.count
19 19
20 - info = [  
21 - n_('One user', '%{num} users', users) % { :num => users },  
22 - n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },  
23 - n__('One community', '%{num} communities', communities) % { :num => communities },  
24 - ] 20 + info = []
  21 + info << (n_('One user', '%{num} users', users) % { :num => users })
  22 + unless owner.enabled?('disable_asset_enterprises')
  23 + info << (n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
  24 + end
  25 + info << (n__('One community', '%{num} communities', communities) % { :num => communities })
25 26
26 block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n")) 27 block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
27 end 28 end
test/unit/environment_statistics_block_test.rb
  Diff comments   View file @c3ee273
@@ -83,4 +83,14 @@ class EnvironmentStatisticsBlockTest &lt; Test::Unit::TestCase @@ -83,4 +83,14 @@ class EnvironmentStatisticsBlockTest &lt; Test::Unit::TestCase
83 assert_match /One community/, content 83 assert_match /One community/, content
84 end 84 end
85 85
  86 + should 'not display enterprises if disabled' do
  87 + env = Environment.new
  88 + env.enable('disable_asset_enterprises')
  89 +
  90 + block = EnvironmentStatisticsBlock.new
  91 + block.stubs(:owner).returns(env)
  92 +
  93 + assert_no_match /enterprises/i, block.content
  94 + end
  95 +
86 end 96 end