Download as
Browse Code »

Commit c3ee273285cbaab0e787755321383abbba562498

Authored by Antonio Terceiro
1 parent dc8aa572
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 17 enterprises = owner.enterprises.visible.count
18 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 27 block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
27 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 83 assert_match /One community/, content
84 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 96 end
... ...