From 6ff873e11bcb0aaf56eccd3d9cce70e67d13c16a Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Mon, 28 Jan 2008 15:13:16 +0000 Subject: [PATCH] ActionItem153: listing communities as well --- app/models/environment.rb | 1 + app/models/environment_statistics_block.rb | 4 +++- test/unit/environment_statistics_block_test.rb | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/environment.rb b/app/models/environment.rb index fea6b00..8f1ec6f 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -41,6 +41,7 @@ class Environment < ActiveRecord::Base has_many :organizations has_many :enterprises has_many :people + has_many :communities has_many :categories has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color' diff --git a/app/models/environment_statistics_block.rb b/app/models/environment_statistics_block.rb index 7d98660..4ae0453 100644 --- a/app/models/environment_statistics_block.rb +++ b/app/models/environment_statistics_block.rb @@ -7,10 +7,12 @@ class EnvironmentStatisticsBlock < Block def content users = owner.people.count enterprises = owner.enterprises.count + communities = owner.communities.count info = [ n_('One user', '%{num} users', users) % { :num => users }, - n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises} + n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises }, + n_('One community', '%{num} communities', communities) % { :num => communities }, ] content_tag('h3', _('Statistics for %s') % owner.name, :class => 'block-title' ) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n")) diff --git a/test/unit/environment_statistics_block_test.rb b/test/unit/environment_statistics_block_test.rb index d4de1a9..3047c2a 100644 --- a/test/unit/environment_statistics_block_test.rb +++ b/test/unit/environment_statistics_block_test.rb @@ -17,6 +17,8 @@ class EnvironmentStatisticsBlockTest < Test::Unit::TestCase env.enterprises.build(:identifier => 'mytestenterprise', :name => 'My test enterprise').save! + env.communities.build(:identifier => 'mytestcommunity', :name => 'mytestcommunity').save! + block = EnvironmentStatisticsBlock.new env.boxes.first.blocks << block @@ -24,6 +26,7 @@ class EnvironmentStatisticsBlockTest < Test::Unit::TestCase assert_match /One enterprise/, content assert_match /2 users/, content + assert_match /One community/, content end end -- libgit2 0.21.2