Download as
Browse Code »

Commit 1a8aab81b6c0154bdded9520ce12d34e7111d529

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent ef2f3ba3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fans Block 

This is an enterprise block that shows all people that added the
enterprise as "favorite".

(ActionItem356)
Showing 8 changed files with 97 additions and 1 deletions   Show diff stats
app/controllers/my_profile/profile_design_controller.rb
  Diff comments   View file @1a8aab8
... ... @@ -25,6 +25,7 @@ class ProfileDesignController < BoxOrganizerController
25 25 blocks << DisabledEnterpriseMessageBlock
26 26 blocks << HighlightsBlock
27 27 blocks << FeaturedProductsBlock
  28 + blocks << FansBlock
28 29 end
29 30  
30 31 # product block exclusive for enterprises in environments that permits it
... ...
app/controllers/public/profile_controller.rb
  Diff comments   View file @1a8aab8
... ... @@ -71,6 +71,10 @@ class ProfileController &lt; PublicController
71 71 end
72 72 end
73 73  
  74 + def fans
  75 + @fans = profile.fans
  76 + end
  77 +
74 78 def favorite_enterprises
75 79 @favorite_enterprises = profile.favorite_enterprises
76 80 end
... ...
app/models/enterprise.rb
  Diff comments   View file @1a8aab8
... ... @@ -7,6 +7,8 @@ class Enterprise &lt; Organization
7 7 has_many :products, :dependent => :destroy, :order => 'name ASC'
8 8 has_many :inputs, :through => :products
9 9  
  10 + has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
  11 +
10 12 extra_data_for_index :product_categories
11 13  
12 14 N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
... ...
app/models/fans_block.rb 0 → 100644
  Diff comments   View file @1a8aab8
... ... @@ -0,0 +1,31 @@
  1 +class FansBlock < ProfileListBlock
  2 +
  3 + def self.description
  4 + _('Fans')
  5 + end
  6 +
  7 + def default_title
  8 + n__('{#} fan', '{#} fans', profile_count)
  9 + end
  10 +
  11 + def help
  12 + _('This block presents the fans of an enterprise.')
  13 + end
  14 +
  15 + def footer
  16 + profile = self.owner
  17 + lambda do
  18 + link_to _('View all'), :profile => profile.identifier, :controller =>
  19 + 'profile', :action => 'fans'
  20 + end
  21 + end
  22 +
  23 + def profiles
  24 + owner.fans
  25 + end
  26 +
  27 + def profile_count
  28 + profiles.visible.count
  29 + end
  30 +
  31 +end
... ...
app/views/profile/fans.rhtml 0 → 100644
  Diff comments   View file @1a8aab8
... ... @@ -0,0 +1,16 @@
  1 +<div class="common-profile-list-block">
  2 +
  3 +<h1><%= __("%s's fans") % profile.name %></h1>
  4 +
  5 +<ul class='profile-list'>
  6 +<% @fans.each do |person| %>
  7 + <li><%= profile_image_link(person)%></li>
  8 +<% end %>
  9 +</ul>
  10 +
  11 +<% button_bar do %>
  12 + <%= button :back, _('Go back'), { :controller => 'profile' }%>
  13 +<% end %>
  14 +
  15 +</div><!-- fim class="common-profile-list-block" -->
  16 +
... ...
test/functional/profile_design_controller_test.rb
  Diff comments   View file @1a8aab8
... ... @@ -10,7 +10,7 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
10 10 PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock]
11 11 PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
12 12  
13   - ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, HighlightsBlock, FeaturedProductsBlock]
  13 + ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, HighlightsBlock, FeaturedProductsBlock, FansBlock]
14 14 ENTERPRISE_BLOCKS_WITH_PRODUCTS_ENABLE = ENTERPRISE_BLOCKS + [ProductsBlock]
15 15  
16 16 attr_reader :holder
... ...
test/unit/enterprise_test.rb
  Diff comments   View file @1a8aab8
... ... @@ -49,6 +49,16 @@ class EnterpriseTest &lt; Test::Unit::TestCase
49 49 end
50 50 end
51 51  
  52 + should 'have fans' do
  53 + p = create_user('test_person').person
  54 + e = fast_create(Enterprise)
  55 +
  56 + p.favorite_enterprises << e
  57 + e.reload
  58 +
  59 + assert_includes e.fans, p
  60 + end
  61 +
52 62 should 'remove products when removing enterprise' do
53 63 e = fast_create(Enterprise, :name => "My enterprise", :identifier => 'myenterprise')
54 64 e.products.create!(:name => 'One product', :product_category => @product_category)
... ...
test/unit/fans_block_test.rb 0 → 100644
  Diff comments   View file @1a8aab8
... ... @@ -0,0 +1,32 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +class FansBlockTest < ActiveSupport::TestCase
  4 +
  5 + should 'inherit from ProfileListBlock' do
  6 + assert_kind_of ProfileListBlock, FansBlock.new
  7 + end
  8 +
  9 + should 'declare its default title' do
  10 + FansBlock.any_instance.stubs(:profile_count).returns(0)
  11 + assert_not_equal ProfileListBlock.new.default_title, FansBlock.new.default_title
  12 + end
  13 +
  14 + should 'describe itself' do
  15 + assert_not_equal ProfileListBlock.description, FansBlock.description
  16 + end
  17 +
  18 + should 'list owner fans' do
  19 +
  20 + block = FansBlock.new
  21 +
  22 + owner = mock
  23 + block.expects(:owner).returns(owner)
  24 +
  25 + list = []
  26 + owner.expects(:fans).returns(list)
  27 +
  28 + assert_same list, block.profiles
  29 + end
  30 +
  31 +end
  32 +
... ...