Merge branch 'stable'

Antonio Terceiro
2 parents 06e61860 10af872d
Showing 23 changed files with 151 additions and 15 deletions Show diff stats
app/controllers/my_profile/profile_members_controller.rb
app/helpers/catalog_helper.rb
app/helpers/display_helper.rb
app/models/add_member.rb
app/models/approve_article.rb
app/models/article.rb
app/models/profile.rb
app/models/published_article.rb
app/sweepers/profile_sweeper.rb
app/views/catalog/show.rhtml
app/views/manage_products/index.rhtml
app/views/manage_products/show.rhtml
app/views/search/_product.rhtml
lib/noosfero.rb
test/functional/catalog_controller_test.rb
test/functional/manage_products_controller_test.rb
test/functional/profile_members_controller_test.rb
test/functional/tasks_controller_test.rb
test/unit/add_member_test.rb
test/unit/approve_article_test.rb
@@ -8,7 +8,7 @@ class ProfileMembersController &lt; MyProfileController
   end
   def update_roles
-    @roles = params[:roles] ? environment.roles.find(params[:roles]) : []
+    @roles = params[:roles] ? environment.roles.find(params[:roles].select{|r|!r.to_i.zero?}) : []
     @roles = @roles.select{|r| r.has_kind?('Profile') }
     @person = profile.members.find { |m| m.id == params[:person].to_i }
     if @person && @person.define_roles(@roles, profile)
@@ -23,7 +23,7 @@ private
   def product_category_name(profile, product_category)
     if profile.enabled?
-      link_to_category(product_category)
+      link_to_product_category(product_category)
     else
       product_category ? product_category.full_name(' &rarr; ') : _('Uncategorized product')
     end
@@ -14,6 +14,14 @@ module DisplayHelper
     link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname })
   end
+  def link_to_product_category(category)
+    if category
+      link_to(category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id, :host => category.environment.default_hostname)
+    else
+      _('Uncategorized product')
+    end
+  end
+
   def txt2html(txt)
     txt.
       gsub( /\n\s*\n/, ' <p/> ' ).
@@ -12,7 +12,7 @@ class AddMember &lt; Task
   def perform
     self.roles ||= [Profile::Roles.member(organization.environment.id).id]
-    target.affiliate(requestor, self.roles.map{|i| Role.find(i)})
+    target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
   end
   def description
@@ -52,7 +52,7 @@ class ApproveArticle &lt; Task
   end
   def article_parent= value
-    article_parent_id = value.id
+    self.article_parent_id = value.id
   end
   def highlighted= value
@@ -54,7 +54,7 @@ class Article &lt; ActiveRecord::Base
   def category_ids=(ids)
     ArticleCategorization.remove_all_for(self)
     ids.uniq.each do |item|
-      add_category(Category.find(item))
+      add_category(Category.find(item)) unless item.to_i.zero?
     end
   end
@@ -176,7 +176,7 @@ class Profile &lt; ActiveRecord::Base
   def category_ids=(ids)
     ProfileCategorization.remove_all_for(self)
     ids.uniq.each do |item|
-      add_category(Category.find(item))
+      add_category(Category.find(item)) unless item.to_i.zero?
     end
   end
@@ -638,4 +638,9 @@ class Profile &lt; ActiveRecord::Base
     ProfileSweeper.new().after_update(profile)
   end
+  # FIXME: horrible workaround to circular dependancy in environment.rb
+  after_create do |profile|
+    ProfileSweeper.new().after_create(profile)
+  end
+
 end
@@ -18,7 +18,7 @@ class PublishedArticle &lt; Article
   before_validation_on_create :update_name
   def update_name
-    self.name ||= self.reference_article.name
+    self.name = self.reference_article.name if self.name.blank?
   end
   def author
@@ -7,6 +7,10 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
     expire_caches(profile)
   end
+  def after_create(profile)
+    expire_statistics_block_cache(profile)
+  end
+
 protected
   def expire_caches(profile)
@@ -19,4 +23,9 @@ protected
       expire_timeout_fragment(block.cache_keys)
     end
   end
+
+  def expire_statistics_block_cache(profile)
+    blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
+    blocks.map(&:cache_keys).each{|ck|expire_timeout_fragment(ck)}
+  end
 end
@@ -15,7 +15,7 @@
 <% end %>
 <p class="product_category">
-<%= _('Category: %s ') % link_to_category(@product.product_category) %>
+<%= _('Category: %s ') % link_to_product_category(@product.product_category) %>
 </p>
 <% button_bar do %>
@@ -45,7 +45,7 @@
   <% @consumptions.each do |consumption| %>
     <tr>
       <td>
-        <strong><%= link_to_category(consumption.product_category) %></strong>
+        <strong><%= link_to_product_category(consumption.product_category) %></strong>
         <br/>
         <em><%= consumption.aditional_specifications  %></em>
       </td>
@@ -3,7 +3,7 @@
 <p> <%= image_tag @product.image.public_filename if @product.image %> </p>
 <p> <strong><%= _('Price:') %></strong> <%= @product.price %> </p>
 <p> <strong><%= _('Description:') %></strong> <%= txt2html @product.description  if @product.description %> </p>
-<p> <strong><%= _('Category:') %></strong> <%= link_to_category(@product.product_category) %> </p>
+<p> <strong><%= _('Category:') %></strong> <%= link_to_product_category(@product.product_category) %> </p>
 <%= button :back, _('back'), :action => 'index' %>
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
@@ -16,6 +16,6 @@ product_item_pos += 1
     <% if product.enterprise %>
       <li> <%= _('Suplier: %s') % link_to_homepage(product.enterprise.name, product.enterprise.identifier) %> </li>
     <% end %>
-    <li> <%= _('Category:') + ' ' + (product.product_category ? link_to(product.product_category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => product.product_category.id) : _('Uncategorized product')) %> </li>
+    <li> <%=_('Category:') + ' ' + link_to_product_category(product.product_category) %> </li>
   </ul>
 </li>
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.19.1'
+  VERSION = '0.19.2'
   SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
   def self.pattern_for_controllers_in_directory(dir)
@@ -12,6 +12,7 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     @enterprise = Enterprise.create!(:name => 'My enterprise', :identifier => 'testent')
   end
+  attr_accessor :enterprise
   def test_local_files_reference
     ent = Enterprise.create!(:identifier => 'test_enterprise1', :name => 'Test enteprise1')
@@ -113,4 +114,20 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     end
   end
+  should 'link to assets products wiht product category in the link to product category on index' do
+    pc = ProductCategory.create!(:name => 'some product', :environment => enterprise.environment)
+    prod = enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => pc)
+
+    get :index, :profile => enterprise.identifier
+    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
+  end
+
+  should 'link to assets products wiht product category in the link to product category on show' do
+    pc = ProductCategory.create!(:name => 'some product', :environment => enterprise.environment)
+    prod = enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => pc)
+
+    get :show, :id => prod.id, :profile => enterprise.identifier
+    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
+  end
+
 end
@@ -274,5 +274,23 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
     assert_equivalent [pc1, pc2], assigns(:categories)
   end
+
+  should 'links to products asset for consumption link' do
+    pc = ProductCategory.create!(:name => 'test_category', :environment =>@enterprise.environment)
+    @enterprise.consumptions.create!(:product_category => pc)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
+  end
+
+  should 'links to products asset for product category link when showing' do
+    pc = ProductCategory.create!(:name => 'test_category', :environment =>@enterprise.environment)
+    p = @enterprise.products.create!(:name => 'test product', :product_category => pc)
+
+    get :show, :profile => @enterprise.identifier, :id => p.id
+
+    assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
+  end
 end
@@ -253,4 +253,16 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
     assert_includes assigns(:users_found), daniela
   end
+  should 'ignore roles with id zero' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    p = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+    r = ent.environment.roles.create!(:name => 'test_role', :permissions => ['some_perm'])
+    get :update_roles, :profile => ent.identifier, :person => p.id, :roles => ["0", r.id, nil]
+
+    p_roles = p.find_roles(ent).map(&:role).uniq
+
+    assert p_roles, [r]
+  end
+
 end
@@ -203,4 +203,24 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     assert_not_nil PublishedArticle.find(:first)
   end
+  should 'handle blank names for published articles' do
+    c = Community.create!(:name => 'test comm')
+    @controller.stubs(:profile).returns(c)
+    c.affiliate(profile, Profile::Roles.all_roles(c.environment))
+    person = create_user('test_user').person
+    p_blog = Blog.create!(:profile => person)
+    c_blog1 = Blog.create!(:profile => c)
+    c_blog2 = Blog.new(:profile => c); c_blog2.name = 'blog2'; c_blog2.save!
+
+    article = person.articles.create!(:name => 'test article', :parent => p_blog)
+    a = ApproveArticle.create!(:article => article, :target => c, :requestor => person)
+    assert_includes c.tasks, a
+
+    assert_difference PublishedArticle, :count do
+        post :close, {"commit"=>"Ok!", "id"=> a.id.to_s, "task"=>{"name"=>"", "closing_statment"=>"", "highlighted"=>"0", "article_parent_id"=>c_blog2.id.to_s}, "decision"=>"finish"}
+    end
+    assert p_article = PublishedArticle.find_by_reference_article_id(article.id)
+    assert_includes c_blog2.children(true), p_article
+  end
+
 end
@@ -95,4 +95,17 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'ignore roles with id zero' do
+    p = create_user('testuser1').person
+    c = Community.create!(:name => 'community_test')
+
+    role = Profile::Roles.member(c.environment.id)
+    TaskMailer.stubs(:deliver_target_notification)
+    task = AddMember.create!(:roles => ["0", role.id, nil], :person => p, :organization => c)
+    task.finish
+
+    current_roles = p.find_roles(c).map(&:role)
+    assert_includes current_roles, role
+  end
+
 end
@@ -63,4 +63,22 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_match /text was removed/, a.description
   end
+  should 'preserve article_parent' do
+    profile = create_user('test_user').person
+    article = profile.articles.create!(:name => 'test article')
+    a = ApproveArticle.new(:article_parent => article)
+
+    assert_equal article, a.article_parent
+  end
+
+  should 'handle blank names' do
+    profile = create_user('test_user').person
+    article = profile.articles.create!(:name => 'test article')
+    community = Community.create!(:name => 'test comm')
+    a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)
+
+    assert_difference PublishedArticle, :count do
+      a.finish
+    end
+  end
 end
@@ -741,4 +741,12 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_not_includes as, a1
   end
+  should 'ignore category with zero as id' do
+    a = profile.articles.create!(:name => 'a test article')
+    c = Category.create!(:name => 'test category', :environment => profile.environment)
+    a.category_ids = ['0', c.id, nil]
+    assert a.save
+    assert_equal [c], a.categories
+  end
+
 end
@@ -288,9 +288,9 @@ class CategoryTest &lt; Test::Unit::TestCase
     c = @env.categories.build(:name => 'my category'); c.save!
     person = create_user('testuser').person
-    a1 = person.articles.build(:name => 'art1', :category_ids => [c]); a1.save!
-    a2 = person.articles.build(:name => 'art2', :category_ids => [c]); a2.save!
-    a3 = person.articles.build(:name => 'art3', :category_ids => [c]); a3.save!
+    a1 = person.articles.build(:name => 'art1', :category_ids => [c.id]); a1.save!
+    a2 = person.articles.build(:name => 'art2', :category_ids => [c.id]); a2.save!
+    a3 = person.articles.build(:name => 'art3', :category_ids => [c.id]); a3.save!
     c1 = a1.comments.build(:title => 'test', :body => 'asdsa', :author => person); c1.save!
     c2 = a2.comments.build(:title => 'test', :body => 'asdsa', :author => person); c2.save!
@@ -1385,6 +1385,14 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal({ :profile => 'testprofile', :controller => 'profile', :action => 'join'}, profile.join_url)
   end
+  should 'ignore categgory with id zero' do
+    profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
+    c = Category.create!(:name => 'test cat', :environment => profile.environment)
+    profile.category_ids = ['0', c.id, nil]
+
+    assert_equal [c], profile.categories
+  end
+
   private
   def assert_invalid_identifier(id)
	@@ -8,7 +8,7 @@ class ProfileMembersController < MyProfileController		@@ -8,7 +8,7 @@ class ProfileMembersController < MyProfileController
8	end	8	end
9		9
10	def update_roles	10	def update_roles
11	- @roles = params[:roles] ? environment.roles.find(params[:roles]) : []	11	+ @roles = params[:roles] ? environment.roles.find(params[:roles].select{\|r\|!r.to_i.zero?}) : []
12	@roles = @roles.select{\|r\| r.has_kind?('Profile') }	12	@roles = @roles.select{\|r\| r.has_kind?('Profile') }
13	@person = profile.members.find { \|m\| m.id == params[:person].to_i }	13	@person = profile.members.find { \|m\| m.id == params[:person].to_i }
14	if @person && @person.define_roles(@roles, profile)	14	if @person && @person.define_roles(@roles, profile)
	@@ -23,7 +23,7 @@ private		@@ -23,7 +23,7 @@ private
23		23
24	def product_category_name(profile, product_category)	24	def product_category_name(profile, product_category)
25	if profile.enabled?	25	if profile.enabled?
26	- link_to_category(product_category)	26	+ link_to_product_category(product_category)
27	else	27	else
28	product_category ? product_category.full_name(' → ') : _('Uncategorized product')	28	product_category ? product_category.full_name(' → ') : _('Uncategorized product')
29	end	29	end
	@@ -14,6 +14,14 @@ module DisplayHelper		@@ -14,6 +14,14 @@ module DisplayHelper
14	link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname })	14	link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname })
15	end	15	end
16		16
		17	+ def link_to_product_category(category)
		18	+ if category
		19	+ link_to(category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id, :host => category.environment.default_hostname)
		20	+ else
		21	+ _('Uncategorized product')
		22	+ end
		23	+ end
		24	+
17	def txt2html(txt)	25	def txt2html(txt)
18	txt.	26	txt.
19	gsub( /\n\s*\n/, ' <p/> ' ).	27	gsub( /\n\s*\n/, ' <p/> ' ).
	@@ -12,7 +12,7 @@ class AddMember < Task		@@ -12,7 +12,7 @@ class AddMember < Task
12		12
13	def perform	13	def perform
14	self.roles \|\|= [Profile::Roles.member(organization.environment.id).id]	14	self.roles \|\|= [Profile::Roles.member(organization.environment.id).id]
15	- target.affiliate(requestor, self.roles.map{\|i\| Role.find(i)})	15	+ target.affiliate(requestor, self.roles.select{\|r\| !r.to_i.zero? }.map{\|i\| Role.find(i)})
16	end	16	end
17		17
18	def description	18	def description
	@@ -52,7 +52,7 @@ class ApproveArticle < Task		@@ -52,7 +52,7 @@ class ApproveArticle < Task
52	end	52	end
53		53
54	def article_parent= value	54	def article_parent= value
55	- article_parent_id = value.id	55	+ self.article_parent_id = value.id
56	end	56	end
57		57
58	def highlighted= value	58	def highlighted= value
	@@ -54,7 +54,7 @@ class Article < ActiveRecord::Base		@@ -54,7 +54,7 @@ class Article < ActiveRecord::Base
54	def category_ids=(ids)	54	def category_ids=(ids)
55	ArticleCategorization.remove_all_for(self)	55	ArticleCategorization.remove_all_for(self)
56	ids.uniq.each do \|item\|	56	ids.uniq.each do \|item\|
57	- add_category(Category.find(item))	57	+ add_category(Category.find(item)) unless item.to_i.zero?
58	end	58	end
59	end	59	end
60		60
	@@ -18,7 +18,7 @@ class PublishedArticle < Article		@@ -18,7 +18,7 @@ class PublishedArticle < Article
18		18
19	before_validation_on_create :update_name	19	before_validation_on_create :update_name
20	def update_name	20	def update_name
21	- self.name \|\|= self.reference_article.name	21	+ self.name = self.reference_article.name if self.name.blank?
22	end	22	end
23		23
24	def author	24	def author
	@@ -7,6 +7,10 @@ class ProfileSweeper # < ActiveRecord::Observer		@@ -7,6 +7,10 @@ class ProfileSweeper # < ActiveRecord::Observer
7	expire_caches(profile)	7	expire_caches(profile)
8	end	8	end
9		9
		10	+ def after_create(profile)
		11	+ expire_statistics_block_cache(profile)
		12	+ end
		13	+
10	protected	14	protected
11		15
12	def expire_caches(profile)	16	def expire_caches(profile)
	@@ -19,4 +23,9 @@ protected		@@ -19,4 +23,9 @@ protected
19	expire_timeout_fragment(block.cache_keys)	23	expire_timeout_fragment(block.cache_keys)
20	end	24	end
21	end	25	end
		26	+
		27	+ def expire_statistics_block_cache(profile)
		28	+ blocks = profile.environment.blocks.select { \|b\| b.kind_of?(EnvironmentStatisticsBlock) }
		29	+ blocks.map(&:cache_keys).each{\|ck\|expire_timeout_fragment(ck)}
		30	+ end
22	end	31	end
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	<% end %>	15	<% end %>
16		16
17	<p class="product_category">	17	<p class="product_category">
18	-<%= _('Category: %s ') % link_to_category(@product.product_category) %>	18	+<%= _('Category: %s ') % link_to_product_category(@product.product_category) %>
19	</p>	19	</p>
20		20
21	<% button_bar do %>	21	<% button_bar do %>
	@@ -45,7 +45,7 @@		@@ -45,7 +45,7 @@
45	<% @consumptions.each do \|consumption\| %>	45	<% @consumptions.each do \|consumption\| %>
46	<tr>	46	<tr>
47	<td>	47	<td>
48	- <strong><%= link_to_category(consumption.product_category) %></strong>	48	+ <strong><%= link_to_product_category(consumption.product_category) %></strong>
49	<br/>	49	<br/>
50	<em><%= consumption.aditional_specifications %></em>	50	<em><%= consumption.aditional_specifications %></em>
51	</td>	51	</td>