ActionItem51: fixing display of products category initial page

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1607 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem51: fixing display of products category initial page
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1607 3f533792-8f58-4932-b0fe-aaf55b0a4547
JoenioCosta
1 parent c4b2472c
Showing 8 changed files with 46 additions and 19 deletions Show diff stats
app/controllers/public/category_controller.rb
app/helpers/application_helper.rb
app/models/product_category.rb
app/views/category/_product_category.rhtml
app/views/category/view.rhtml
test/functional/category_controller_test.rb
test/unit/product_category_test.rb
test/unit/profile_categorization_test.rb
@@ -2,14 +2,26 @@ class CategoryController &lt; PublicController
   # view the summary of one category
   def view
-    # TODO: load articles, documents, etc so the view can list them.
-    @recent_articles = category.recent_articles
-    @recent_comments = category.recent_comments
-    @most_commented_articles = category.most_commented_articles
+    send('action_' + @category.class.name.underscore) 
   end
   attr_reader :category
   before_filter :load_category, :only => [ :view ]
+  private
+
+  def action_product_category
+    @products = category.products
+    @enterprises = category.products.map{|p| p.enterprise}.flatten.uniq
+    @users = category.consumers
+  end
+
+  def action_category
+    # TODO: load articles, documents, etc so the view can list them.
+    @recent_articles = category.recent_articles
+    @recent_comments = category.recent_comments
+    @most_commented_articles = category.most_commented_articles
+  end
+  alias :action_region :action_category
 end
@@ -306,9 +306,10 @@ module ApplicationHelper
     concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)), block.binding)
   end
-  def link_to_category(category)
+  def link_to_category(category, full = true)
     return _('Uncategorized product') unless category
-    link_to category.full_name, :controller => 'category', :action => 'view', :category_path => category.path.split('/')
+    name = full ? category.full_name : category.name
+    link_to name, :controller => 'category', :action => 'view', :category_path => category.path.split('/')
   end
   def link_to_product(product)
 class ProductCategory < Category
   has_many :products
   has_many :consumptions
-  has_many :consumers, :through => :consumptions, :source => :profile_id
+  has_many :consumers, :through => :consumptions, :source => :profile
   def tree
     children.inject([]){|all,c| all + c.tree } << self
@@ -9,7 +9,8 @@
 <ul>
   <% @products.each do |p| %>
     <li>
-    <%= image_tag p.image.public_filename(:thumb) if p.image%> <%= link_to_product(p) %> <br/>
+    <%= image_tag p.image.public_filename(:thumb) if p.image%>
+    <%= link_to_product(p) %> <br/>
     <% if p.price %>
       <%= _('Price: %d') % p.price %> <br/>
     <% end %>
 <div id="view-category">
   <div id="category-ancestors">
-    <%= @category.ancestors.reverse.map { |a| link_to_category(a) }.join(' &rarr; ') %>
+    <%= @category.ancestors.reverse.map { |a| link_to_category(a, false) }.join(' &rarr; ') %>
   </div><!-- end id="category-ancestors" -->
   <h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>
@@ -52,7 +52,10 @@ class CategoryControllerTest &lt; Test::Unit::TestCase
   should 'display category of products' do
     cat = ProductCategory.create!(:name => 'Food', :environment => Environment.default)
+    ent = Enterprise.create!(:name => 'Enterprise test', :identifier => 'enterprise_test')
+    p = cat.products.create!(:name => 'product test', :enterprise => ent)
     get :view, :category_path => cat.path.split('/')
+    assert_includes assigns(:products), p
   end
 end
@@ -3,36 +3,36 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProductCategoryTest < Test::Unit::TestCase
   # TODO: please write tests here when ProductCategory has something
   def test_require_same_class_for_children
-    c1 = ProductCategory.new(:name => 'Some Product Type', :environment_id => 1)
+    c1 = ProductCategory.new(:name => 'Some Product Type', :environment => Environment.default)
     c1.save!
-    c2 = Category.new(:name => 'wrong', :environment_id => 1)
+    c2 = Category.new(:name => 'wrong', :environment => Environment.default)
     c1.children << c2
     assert !c2.valid?
     assert c2.errors.invalid?(:type)
-    c3 = ProductCategory.new(:name => 'right', :environment_id => 1)
+    c3 = ProductCategory.new(:name => 'right', :environment => Environment.default)
     c1.children << c3
     assert c3.valid?
     assert !c3.errors.invalid?(:type)
   end
   def test_tree
-    c0 = ProductCategory.create(:name => 'base_cat', :environment_id => 1)
+    c0 = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default)
     assert ! c0.new_record?
     assert_equivalent [c0], c0.tree
-    c1 = ProductCategory.create(:name => 'cat_1', :parent => c0, :environment_id => 1)
+    c1 = ProductCategory.create!(:name => 'cat_1', :parent => c0, :environment => Environment.default)
     c0.reload
     assert_equivalent [c1], c1.tree
     assert_equivalent [c0, c1], c0.tree
-    c2 = ProductCategory.create(:name => 'cat_2', :parent => c0, :environment_id => 1)
+    c2 = ProductCategory.create!(:name => 'cat_2', :parent => c0, :environment => Environment.default)
     c0.reload; c1.reload;
     assert_equivalent [c0,c1,c2] , c0.tree
-    c3 = ProductCategory.create(:name => 'cat_3', :parent => c2, :environment_id => 1)
+    c3 = ProductCategory.create!(:name => 'cat_3', :parent => c2, :environment => Environment.default)
     c0.reload; c1.reload; c2.reload
     assert_equivalent [c0,c1,c2,c3], c0.tree
     assert_equivalent [c2,c3], c2.tree
@@ -40,17 +40,25 @@ class ProductCategoryTest &lt; Test::Unit::TestCase
   end
   def test_all_products
-    c0 = ProductCategory.create(:name => 'base_cat', :environment_id => 1)
+    c0 = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default)
     assert_equivalent [], c0.all_products
     p0 = Product.create(:name => 'product1', :product_category => c0)
     c0.reload
     assert_equivalent [p0], c0.all_products
-    c1 = ProductCategory.create(:name => 'cat_1', :parent => c0, :environment_id => 1)
+    c1 = ProductCategory.create!(:name => 'cat_1', :parent => c0, :environment => Environment.default)
     p1 = Product.create(:name => 'product2', :product_category => c1)
     c0.reload; c1.reload
     assert_equivalent [p0, p1], c0.all_products
     assert_equivalent [p1], c1.all_products 
   end
+
+  should 'have consumers' do
+    c = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default)
+    person = create_user('test_user').person
+    c.consumers << person
+    assert_includes c.consumers, person
+  end
+
 end
 require File.dirname(__FILE__) + '/../test_helper'
 class ProfileCategorizationTest < ActiveSupport::TestCase
+
   should 'have profile and category' do
     person = create_user('test_user').person
     cat = Environment.default.categories.build(:name => 'a category'); cat.save!
     person.categories << cat
     person.save!
     assert_includes person.categories, cat
-    assert_includes cat.profiles, person
+    assert_includes cat.people, person
     assert_equal [cat.id], person.category_ids 
   end
+
 end
	@@ -2,14 +2,26 @@ class CategoryController < PublicController		@@ -2,14 +2,26 @@ class CategoryController < PublicController
2		2
3	# view the summary of one category	3	# view the summary of one category
4	def view	4	def view
5	- # TODO: load articles, documents, etc so the view can list them.
6	- @recent_articles = category.recent_articles
7	- @recent_comments = category.recent_comments
8	- @most_commented_articles = category.most_commented_articles	5	+ send('action_' + @category.class.name.underscore)
9	end	6	end
10		7
11	attr_reader :category	8	attr_reader :category
12		9
13	before_filter :load_category, :only => [ :view ]	10	before_filter :load_category, :only => [ :view ]
		11	+ private
		12	+
		13	+ def action_product_category
		14	+ @products = category.products
		15	+ @enterprises = category.products.map{\|p\| p.enterprise}.flatten.uniq
		16	+ @users = category.consumers
		17	+ end
		18	+
		19	+ def action_category
		20	+ # TODO: load articles, documents, etc so the view can list them.
		21	+ @recent_articles = category.recent_articles
		22	+ @recent_comments = category.recent_comments
		23	+ @most_commented_articles = category.most_commented_articles
		24	+ end
		25	+ alias :action_region :action_category
14		26
15	end	27	end
1	class ProductCategory < Category	1	class ProductCategory < Category
2	has_many :products	2	has_many :products
3	has_many :consumptions	3	has_many :consumptions
4	- has_many :consumers, :through => :consumptions, :source => :profile_id	4	+ has_many :consumers, :through => :consumptions, :source => :profile
5		5
6	def tree	6	def tree
7	children.inject([]){\|all,c\| all + c.tree } << self	7	children.inject([]){\|all,c\| all + c.tree } << self
1	<div id="view-category">	1	<div id="view-category">
2		2
3	<div id="category-ancestors">	3	<div id="category-ancestors">
4	- <%= @category.ancestors.reverse.map { \|a\| link_to_category(a) }.join(' → ') %>	4	+ <%= @category.ancestors.reverse.map { \|a\| link_to_category(a, false) }.join(' → ') %>
5	</div><!-- end id="category-ancestors" -->	5	</div><!-- end id="category-ancestors" -->
6		6
7	<h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>	7	<h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>