Merge branch 'stable'

Rodrigo Souto
2 parents 5aecb772 38b450a5
Showing 15 changed files with 110 additions and 47 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/views/search/_product.rhtml
debian/changelog
lib/noosfero.rb
lib/noosfero/plugin.rb
plugins/spaminator/lib/spaminator_plugin/scan.rb
plugins/spaminator/lib/spaminator_plugin/scan_job.rb
plugins/spaminator/script/scan
plugins/stoa/lib/stoa_plugin.rb
plugins/stoa/test/functional/invite_controller_test.rb
plugins/stoa/test/unit/stoa_plugin_test.rb
test/functional/search_controller_test.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
@@ -25,24 +25,26 @@ class ContentViewerController &lt; ApplicationController
           return
         end
       end
-
-      # page not found, give error
-      if @page.nil?
-        render_not_found(@path)
-        return
-      end
     end
-    if !@page.display_to?(user)
-      if profile.display_info_to?(user) || !profile.visible?
-        message = _('You are not allowed to view this content. You can contact the owner of this profile to request access then.')
+    if !@page.nil? && !@page.display_to?(user)
+      if !profile.public?
+        private_profile_partial_parameters
+        render :template => 'profile/_private_profile.rhtml', :status => 403
+      else #if !profile.visible?
+        message = _('You are not allowed to view this content.')
+        message += ' ' + _('You can contact the owner of this profile to request access then.')
         render_access_denied(message)
-      elsif !profile.public?
-        redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
       end
       return
     end
+    # page not found, give error
+    if @page.nil?
+      render_not_found(@path)
+      return
+    end
+
     if request.xhr? && params[:toolbar]
       render :partial => 'article_toolbar'
       return
@@ -368,14 +368,7 @@ class ProfileController &lt; PublicController
   end
   def private_profile
-    if profile.person?
-      @action = :add_friend
-      @message = _("The content here is available to %s's friends only.") % profile.short_name
-    else
-      @action = :join
-      @message = _('The contents in this community is available to members only.')
-    end
-    @no_design_blocks = true
+    private_profile_partial_parameters
   end
   def invisible_profile
@@ -1411,4 +1411,16 @@ module ApplicationHelper
     options[:class] = "comment-footer comment-footer-link comment-footer-hide"
     expirable_content_reference content, action, text, url, options
   end
+
+  def private_profile_partial_parameters
+    if profile.person?
+      @action = :add_friend
+      @message = _("The content here is available to %s's friends only.") % profile.short_name
+    else
+      @action = :join
+      @message = _('The contents in this community is available to members only.')
+    end
+    @no_design_blocks = true
+  end
+
 end
-<% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
+<% extra_content = @plugins.dispatch(:asset_product_extras, product).collect { |content| instance_eval(&content) } %>
 <% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
 <li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
+noosfero (0.39.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Sat, 19 Jan 2013 19:27:04 +0000
+
 noosfero (0.39.2) unstable; urgency=low
   * Bugfixes release
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.39.2'
+  VERSION = '0.39.3'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -161,7 +161,7 @@ class Noosfero::Plugin
   # -> Adds content to products on asset list
   # returns = lambda block that creates html code
-  def asset_product_extras(product, enterprise)
+  def asset_product_extras(product)
     nil
   end
@@ -0,0 +1,18 @@
+class SpaminatorPlugin::Scan
+  def self.run(environment_id)
+    environment = Environment.find(environment_id)
+    settings = Noosfero::Plugin::Settings.new(environment, SpaminatorPlugin)
+    settings.scanning = true
+    settings.save!
+
+    begin
+      SpaminatorPlugin::Spaminator.run(environment)
+    rescue Exception => exception
+      SpaminatorPlugin::Spaminator.log("Spaminator failed with the following error: \n ==> #{exception}\n#{exception.backtrace.join("\n")}")
+    end
+
+    settings.scanning = false
+    SpaminatorPlugin.schedule_scan(environment) if settings.deployed
+    settings.save!
+  end
+end
 class SpaminatorPlugin::ScanJob < Struct.new(:environment_id)
   def perform
-    fork do
-      environment = Environment.find(environment_id)
-      settings = Noosfero::Plugin::Settings.new(environment, SpaminatorPlugin)
-      settings.scanning = true
-      settings.save!
-
-      begin
-        SpaminatorPlugin::Spaminator.run(environment)
-      rescue Exception => exception
-        SpaminatorPlugin::Spaminator.log("Spaminator failed with the following error: \n ==> #{exception}\n#{exception.backtrace.join("\n")}")
-      end
-
-      settings.scanning = false
-      SpaminatorPlugin.schedule_scan(environment) if settings.deployed
-      settings.save!
-    end
+    fork {system("ruby #{File.join(SpaminatorPlugin.root_path, 'script', 'scan')} #{environment_id}") }
   end
 end
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../config/environment'
+SpaminatorPlugin::Scan.run(ARGV[0])
@@ -107,14 +107,14 @@ class StoaPlugin &lt; Noosfero::Plugin
   def invite_controller_filters
     [{ :type => 'before_filter',
       :method_name => 'check_usp_id_existence',
-      :block => lambda {render_access_denied if profile.usp_id.blank?} }]
+      :block => lambda {render_access_denied if !user || user.usp_id.blank?} }]
   end
   def control_panel_buttons
     { :title => _('Invite friends'),
       :icon => 'invite-friends',
       :url => {:controller => 'invite',
-               :action => 'select_address_book'} } if !context.profile.usp_id.blank?
+               :action => 'select_address_book'} } if context.send(:user) && context.send(:user).usp_id.present?
   end
   def remove_invite_friends_button
@@ -36,5 +36,17 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_response 200
   end
+  should 'alow invitation even in organizations' do
+    person_with_usp_id = User.create!(:login => 'user-with', :email => 'user-with@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
+    organization = fast_create(Organization)
+    organization.add_admin(person_with_usp_id)
+
+    login_as(person_with_usp_id.identifier)
+    get :select_address_book, :profile => organization.identifier
+    assert_response 200
+    get :select_friends, :profile => organization.identifier, :contact_list => ContactList.create.id
+    assert_response 200
+  end
+
 end
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class StoaPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = StoaPlugin.new
+  end
+
+  attr_reader :plugin
+
+  should 'display invite control panel button only to users with usp_id' do
+    person_with_usp_id = fast_create(Person, :usp_id => 99999999)
+    person_without_usp_id = fast_create(Person)
+    context = mock()
+    StoaPlugin.any_instance.stubs(:context).returns(context)
+
+    context.stubs(:user).returns(nil)
+    assert_nil plugin.control_panel_buttons
+
+    context.stubs(:user).returns(person_without_usp_id)
+    assert_nil plugin.control_panel_buttons
+
+    context.stubs(:user).returns(person_with_usp_id)
+    assert_not_nil plugin.control_panel_buttons
+  end
+end
+
@@ -227,13 +227,13 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'include extra content supplied by plugins on product asset' do
     class Plugin1 < Noosfero::Plugin
-      def asset_product_extras(product, enterprise)
+      def asset_product_extras(product)
         lambda {"<span id='plugin1'>This is Plugin1 speaking!</span>"}
       end
     end
     class Plugin2 < Noosfero::Plugin
-      def asset_product_extras(product, enterprise)
+      def asset_product_extras(product)
         lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
@@ -235,11 +235,15 @@ module ActsAsSolr #:nodoc:
             iteration_start = Time.now
             iteration_items, iteration_add_batch = queue.pop(true)
-            if options[:delayed_job]
-              delay.solr_add iteration_add_batch
-            else
-              solr_add iteration_add_batch
-              solr_commit
+            begin
+              if options[:delayed_job]
+                delay.solr_add iteration_add_batch
+              else
+                solr_add iteration_add_batch
+                solr_commit
+              end
+            rescue Exception => exception
+              logger.error(exception.to_s)
             end
             last_id = iteration_items.last.id
	@@ -368,14 +368,7 @@ class ProfileController < PublicController		@@ -368,14 +368,7 @@ class ProfileController < PublicController
368	end	368	end
369		369
370	def private_profile	370	def private_profile
371	- if profile.person?
372	- @action = :add_friend
373	- @message = _("The content here is available to %s's friends only.") % profile.short_name
374	- else
375	- @action = :join
376	- @message = _('The contents in this community is available to members only.')
377	- end
378	- @no_design_blocks = true	371	+ private_profile_partial_parameters
379	end	372	end
380		373
381	def invisible_profile	374	def invisible_profile
	@@ -1411,4 +1411,16 @@ module ApplicationHelper		@@ -1411,4 +1411,16 @@ module ApplicationHelper
1411	options[:class] = "comment-footer comment-footer-link comment-footer-hide"	1411	options[:class] = "comment-footer comment-footer-link comment-footer-hide"
1412	expirable_content_reference content, action, text, url, options	1412	expirable_content_reference content, action, text, url, options
1413	end	1413	end
		1414	+
		1415	+ def private_profile_partial_parameters
		1416	+ if profile.person?
		1417	+ @action = :add_friend
		1418	+ @message = _("The content here is available to %s's friends only.") % profile.short_name
		1419	+ else
		1420	+ @action = :join
		1421	+ @message = _('The contents in this community is available to members only.')
		1422	+ end
		1423	+ @no_design_blocks = true
		1424	+ end
		1425	+
1414	end	1426	end
1	-<% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { \|content\| instance_eval(&content) } %>	1	+<% extra_content = @plugins.dispatch(:asset_product_extras, product).collect { \|content\| instance_eval(&content) } %>
2	<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>	2	<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
3		3
4	<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">	4	<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
		1	+noosfero (0.39.3) unstable; urgency=low
		2	+
		3	+ * Bugfixes release
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Sat, 19 Jan 2013 19:27:04 +0000
		6	+
1	noosfero (0.39.2) unstable; urgency=low	7	noosfero (0.39.2) unstable; urgency=low
2		8
3	* Bugfixes release	9	* Bugfixes release
	@@ -2,7 +2,7 @@ require 'fast_gettext'		@@ -2,7 +2,7 @@ require 'fast_gettext'
2		2
3	module Noosfero	3	module Noosfero
4	PROJECT = 'noosfero'	4	PROJECT = 'noosfero'
5	- VERSION = '0.39.2'	5	+ VERSION = '0.39.3'
6		6
7	def self.pattern_for_controllers_in_directory(dir)	7	def self.pattern_for_controllers_in_directory(dir)
8	disjunction = controllers_in_directory(dir).join('\|')	8	disjunction = controllers_in_directory(dir).join('\|')
	@@ -161,7 +161,7 @@ class Noosfero::Plugin		@@ -161,7 +161,7 @@ class Noosfero::Plugin
161		161
162	# -> Adds content to products on asset list	162	# -> Adds content to products on asset list
163	# returns = lambda block that creates html code	163	# returns = lambda block that creates html code
164	- def asset_product_extras(product, enterprise)	164	+ def asset_product_extras(product)
165	nil	165	nil
166	end	166	end
167		167
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class SpaminatorPlugin::Scan
	2	+ def self.run(environment_id)
	3	+ environment = Environment.find(environment_id)
	4	+ settings = Noosfero::Plugin::Settings.new(environment, SpaminatorPlugin)
	5	+ settings.scanning = true
	6	+ settings.save!
	7	+
	8	+ begin
	9	+ SpaminatorPlugin::Spaminator.run(environment)
	10	+ rescue Exception => exception
	11	+ SpaminatorPlugin::Spaminator.log("Spaminator failed with the following error: \n ==> #{exception}\n#{exception.backtrace.join("\n")}")
	12	+ end
	13	+
	14	+ settings.scanning = false
	15	+ SpaminatorPlugin.schedule_scan(environment) if settings.deployed
	16	+ settings.save!
	17	+ end
	18	+end
1	class SpaminatorPlugin::ScanJob < Struct.new(:environment_id)	1	class SpaminatorPlugin::ScanJob < Struct.new(:environment_id)
2	def perform	2	def perform
3	- fork do
4	- environment = Environment.find(environment_id)
5	- settings = Noosfero::Plugin::Settings.new(environment, SpaminatorPlugin)
6	- settings.scanning = true
7	- settings.save!
8	-
9	- begin
10	- SpaminatorPlugin::Spaminator.run(environment)
11	- rescue Exception => exception
12	- SpaminatorPlugin::Spaminator.log("Spaminator failed with the following error: \n ==> #{exception}\n#{exception.backtrace.join("\n")}")
13	- end
14	-
15	- settings.scanning = false
16	- SpaminatorPlugin.schedule_scan(environment) if settings.deployed
17	- settings.save!
18	- end	3	+ fork {system("ruby #{File.join(SpaminatorPlugin.root_path, 'script', 'scan')} #{environment_id}") }
19	end	4	end
20	end	5	end
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+#!/usr/bin/env ruby
	2	+
	3	+require File.dirname(__FILE__) + '/../../../config/environment'
	4	+SpaminatorPlugin::Scan.run(ARGV[0])
	@@ -107,14 +107,14 @@ class StoaPlugin < Noosfero::Plugin		@@ -107,14 +107,14 @@ class StoaPlugin < Noosfero::Plugin
107	def invite_controller_filters	107	def invite_controller_filters
108	[{ :type => 'before_filter',	108	[{ :type => 'before_filter',
109	:method_name => 'check_usp_id_existence',	109	:method_name => 'check_usp_id_existence',
110	- :block => lambda {render_access_denied if profile.usp_id.blank?} }]	110	+ :block => lambda {render_access_denied if !user \|\| user.usp_id.blank?} }]
111	end	111	end
112		112
113	def control_panel_buttons	113	def control_panel_buttons
114	{ :title => _('Invite friends'),	114	{ :title => _('Invite friends'),
115	:icon => 'invite-friends',	115	:icon => 'invite-friends',
116	:url => {:controller => 'invite',	116	:url => {:controller => 'invite',
117	- :action => 'select_address_book'} } if !context.profile.usp_id.blank?	117	+ :action => 'select_address_book'} } if context.send(:user) && context.send(:user).usp_id.present?
118	end	118	end
119		119
120	def remove_invite_friends_button	120	def remove_invite_friends_button