Merge branch 'stable'

Conflicts: app/views/shared/block.rhtml debian/changelog debian/control script/production

Merge branch 'stable'
Conflicts: app/views/shared/block.rhtml debian/changelog debian/control script/production
Daniela Feitosa
2 parents 11762ec8 a4c344d9
Showing 36 changed files with 162 additions and 46 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/boxes_helper.rb
app/models/article_block.rb
app/models/block.rb
app/models/blog_archives_block.rb
app/models/categories_block.rb
app/models/disabled_enterprise_message_block.rb
app/models/environment_statistics_block.rb
app/models/featured_products_block.rb
app/models/feed_reader_block.rb
app/models/highlights_block.rb
app/models/link_list_block.rb
app/models/location_block.rb
app/models/login_block.rb
app/models/main_block.rb
app/models/my_network_block.rb
app/models/products_block.rb
app/models/profile_image_block.rb
app/models/profile_info_block.rb
app/models/profile_list_block.rb
@@ -211,7 +211,8 @@ class ProfileController &lt; PublicController
  
   def remove_activity
     begin
-      activity = current_person.tracked_actions.find(params[:activity_id])
+      raise if !can_edit_profile
+      activity = ActionTracker::Record.find(params[:activity_id])
       activity.destroy
       render :text => _('Activity successfully removed.')
     rescue
@@ -219,6 +220,17 @@ class ProfileController &lt; PublicController
     end
   end
  
+  def remove_notification
+    begin
+      raise if !can_edit_profile
+      notification = ActionTrackerNotification.find(:first, :conditions => {:profile_id => profile.id, :action_tracker_id => params[:activity_id]})
+      notification.destroy
+      render :text => _('Notification successfully removed.')
+    rescue
+      render :text => _('You could not remove this notification.')
+    end
+  end
+
   def profile_info
     begin
       @block = profile.blocks.find(params[:block_id])
@@ -320,4 +332,8 @@ class ProfileController &lt; PublicController
     20
   end
  
+  def can_edit_profile
+    @can_edit_profile ||= user && user.has_permission?('edit_profile', profile)
+  end
+  helper_method :can_edit_profile
 end
@@ -81,8 +81,8 @@ module BoxesHelper
     box_decorator == DontMoveBlocks
   end
  
-  def display_block_content(block, main_content = nil)
-    content = block.main? ? wrap_main_content(main_content) : block.content
+  def display_block_content(block, person, main_content = nil)
+    content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
     result = extract_block_content(content)
     footer_content = extract_block_content(block.footer)
     unless footer_content.blank?
@@ -8,7 +8,7 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       block_title(block.title) +
@@ -81,7 +81,7 @@ class Block &lt; ActiveRecord::Base
   # The method can also return <tt>nil</tt>, which means "no content".
   #
   # See BoxesHelper#extract_block_content for implementation details. 
-  def content
+  def content(args={})
     "This is block number %d" % self.id
   end
  
@@ -20,11 +20,15 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
  
-  def content
+  def visible_posts(person)
+    blog.posts.native_translations.select {|post| post.display_to?(person)}
+  end
+
+  def content(args={})
     owner_blog = self.blog
     return nil unless owner_blog
     results = ''
-    owner_blog.posts.native_translations.group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
+    visible_posts(args[:person]).group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
       results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
       results << "<ul class='#{year}-archive'>"
       results_by_year.group_by{|i| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do |month, results_by_month|
@@ -28,7 +28,7 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/categories', :locals => { :block => block }
@@ -12,7 +12,7 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
  
-  def content
+  def content(args={})
     message = self.owner.environment.message_for_disabled_enterprise || ''
     lambda do
        render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
@@ -12,7 +12,7 @@ class EnvironmentStatisticsBlock &lt; Block
     _('This block presents some statistics about your environment.')
   end
  
-  def content
+  def content(args={})
     users = owner.people.visible.count
     enterprises = owner.enterprises.visible.count
     communities = owner.communities.visible.count
@@ -25,7 +25,7 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/featured_products', :locals => { :block => block }
@@ -78,7 +78,7 @@ class FeedReaderBlock &lt; Block
     self.save!
   end
  
-  def content
+  def content(args={})
     block_title(title) + formatted_feed_content
   end
  
@@ -28,7 +28,7 @@ class HighlightsBlock &lt; Block
     shuffle ? block_images.shuffle : block_images
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/highlights', :locals => { :block => block }
@@ -47,7 +47,7 @@ class LinkListBlock &lt; Block
     _('This block can be used to create a menu of links. You can add, remove and update the links as you wish.')
   end
  
-  def content
+  def content(args={})
     block_title(title) +
     content_tag('ul',
       links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}
@@ -11,7 +11,7 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
  
-  def content
+  def content(args={})
     profile = self.owner
     title = self.title
     if profile.lat
@@ -8,7 +8,7 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
  
-  def content
+  def content(args={})
     lambda do
       render :file => 'blocks/login_block'
     end
@@ -8,7 +8,7 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
  
-  def content
+  def content(args={})
     nil
   end
  
@@ -14,7 +14,7 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/my_network', :locals => {
@@ -16,7 +16,7 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
  
-  def content
+  def content(args={})
     block_title(title) +
     content_tag(
       'ul',
@@ -10,7 +10,7 @@ class ProfileImageBlock &lt; Block
     _('This block presents the profile image')
   end
  
-  def content
+  def content(args={})
     block = self
     s = show_name
     lambda do
@@ -8,7 +8,7 @@ class ProfileInfoBlock &lt; Block
     _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/profile_info', :locals => { :block => block }
@@ -37,7 +37,7 @@ class ProfileListBlock &lt; Block
     _('Clicking on the people or groups will take you to their home page.')
   end
  
-  def content
+  def content(args={})
     profiles = self.profile_list
     title = self.view_title
     nl = "\n"
@@ -4,7 +4,7 @@ class ProfileSearchBlock &lt; Block
     _('Display a form to search the profile')
   end
  
-  def content
+  def content(args={})
     title = self.title
     lambda do
       render :file => 'blocks/profile_search', :locals => { :title => title }
@@ -6,7 +6,7 @@ class RawHTMLBlock &lt; Block
  
   settings_items :html, :type => :text
  
-  def content
+  def content(args={})
     (title.blank? ? '' : block_title(title)) + html.to_s
   end
  
@@ -15,7 +15,7 @@ class RecentDocumentsBlock &lt; Block
   settings_items :limit, :type => :integer, :default => 5
  
   include ActionController::UrlWriter
-  def content
+  def content(args={})
     docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit)
  
     block_title(title) +
@@ -16,7 +16,7 @@ class SellersSearchBlock &lt; Block
     _('This block presents a search engine for products.')
   end
  
-  def content
+  def content(args={})
     title = self.title
     lambda do
       render :file => 'search/_sellers_form', :locals => { :title => title }
@@ -31,7 +31,7 @@ class SlideshowBlock &lt; Block
     gallery.images.reject {|item| item.folder?}
   end
  
-  def content
+  def content(args={})
     block = self
     if gallery
       images = block_images
@@ -19,7 +19,7 @@ class TagsBlock &lt; Block
        Try to add some tags to some articles and you'l see your tag cloud growing.")
   end
  
-  def content
+  def content(args={})
     tags = owner.article_tags
     return '' if tags.empty?
  
@@ -6,7 +6,7 @@
     <div class='profile-activity-description'>
       <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
       <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-      <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+      <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if can_edit_profile %>
     </div>
     <hr />  
   </li>
@@ -9,6 +9,7 @@
       <div class='profile-network-description'>
         <p class='profile-network-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
         <p class='profile-network-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+        <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_notification', :activity_id => activity.id}, :update => "profile-network-item-#{activity.id}") if can_edit_profile %>
         <p class='profile-network-where'><%= _('In community %s') % link_to(activity.target.name, activity.target.url) if !profile.is_a?(Community) && activity.target.is_a?(Community) %></p>
       </div>
         <div id='profile-network-message-<%= activity.id%>' style='display:none;'>
 <% if block.cacheable? && use_cache %>
   <% cache_timeout(block.cache_key, block.timeout) do %>
-    <%= display_block_content(block, main_content) %>
+    <%= display_block_content(block, user, main_content) %>
   <% end %>
 <% else %>
-  <%= display_block_content(block, main_content) %>
+  <%= display_block_content(block, user, main_content) %>
 <% end %>
@@ -9,6 +9,29 @@ noosfero (0.36.0~1) unstable; urgency=low
  
  -- Antonio Terceiro <terceiro@colivre.coop.br>  Sun, 27 Nov 2011 14:11:33 -0200
  
+noosfero (0.35.2) unstable; urgency=low
+
+  * Bugfixes version release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 02 Mar 2012 13:36:02 -0300
+
+noosfero (0.35.2~1) unstable; urgency=low
+
+  * Bugfixes version release
+  * Added missing Build dependencies to build in a clean chroot: rake, rails,
+    libferret-ruby, libwill-paginate-ruby, tango-icon-theme, rcov
+  * Noosfero needs a functioning MTA: added dependency on exim4 |
+    mail-transport-agent.
+  * /usr/share/dbconfig-common/scripts/noosfero/install/pgsql: run db:migrate
+    just after db:schema:load.
+  * etc/init.d/noosfero: forward fix for the Lenny → Squeeze upgrade. In
+    Squeeze, `rails` is an empty package that depends on rails-ruby1.8, but
+    rails-ruby1.8 is only unpacked *after* noosfero prerm runs. This way, the
+    initscript must be able to stop the services without any of the Rails
+    libraries available.
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Thu, 01 Mar 2012 14:37:15 -0300
+
 noosfero (0.35.1) unstable; urgency=low
  
   * Bugfixes version release
@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Noosfero developers <noosfero-dev@listas.softwarelivre.org>
 Uploaders: Antonio Terceiro <terceiro@colivre.coop.br>
-Build-Depends: debhelper (>= 7.0.50~), po4a, libgettext-ruby-util, libgettext-ruby1.8, libsqlite3-ruby1.8,
+Build-Depends: debhelper (>= 7.0.50~), po4a, libgettext-ruby-util, libgettext-ruby1.8, libsqlite3-ruby1.8, rake, rails, libferret-ruby, libwill-paginate-ruby, tango-icon-theme, rcov
 Standards-Version: 3.8.4
 Homepage: http://noosfero.org/
 Vcs-Git: git://git.colivre.coop.br/noosfero.git
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
  
 Package: noosfero
 Architecture: all
-Depends: rails (>= 2.3.5-1~), rails-ruby1.8 (>= 2.3.5-1~), ruby1.8, ruby, rake, libgettext-rails-ruby1.8, libsqlite3-ruby, libpgsql-ruby, libmysql-ruby, librmagick-ruby, libredcloth-ruby, libwill-paginate-ruby (>= 2.3.12-1~), iso-codes, libfeedparser-ruby, libferret-ruby, libdaemons-ruby, rcov, mongrel, mongrel-cluster, tango-icon-theme, libhpricot-ruby, iso-codes, memcached, debconf, dbconfig-common, postgresql, adduser, ${misc:Depends}
+Depends: rails (>= 2.3.5-1~), rails-ruby1.8 (>= 2.3.5-1~), ruby1.8, ruby, rake, libgettext-rails-ruby1.8, libsqlite3-ruby, libpgsql-ruby, libmysql-ruby, librmagick-ruby, libredcloth-ruby, libwill-paginate-ruby (>= 2.3.12-1~), iso-codes, libfeedparser-ruby, libferret-ruby, libdaemons-ruby, rcov, mongrel, mongrel-cluster, tango-icon-theme, libhpricot-ruby, iso-codes, memcached, debconf, dbconfig-common, postgresql, adduser, exim4 | mail-transport-agent, ${misc:Depends}
 Recommends: postgresql-client
 Description: free web-based platform for social networks
  Noosfero is a web platform for social and solidarity economy networks with
@@ -8,4 +8,5 @@ sed -i -e &#39;s/adapter: pgsql/adapter: postgresql/&#39; /etc/noosfero/database.yml
 /etc/init.d/noosfero setup
  
 cd /usr/share/noosfero && su noosfero -c "rake db:schema:load RAILS_ENV=production"
+cd /usr/share/noosfero && su noosfero -c "rake db:migrate RAILS_ENV=production SCHEMA=/dev/null"
 cd /usr/share/noosfero && su noosfero -c "rake db:data:minimal RAILS_ENV=production"
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.35.1'
+  VERSION = '0.35.2'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -40,10 +40,34 @@ do_start() {
 }
  
 do_stop() {
-  ruby -S thin -C config/thin.yml stop
-  ./script/delayed_job stop
-  ./script/feed-updater stop
-  ./script/ferret_server -e $RAILS_ENV stop
+
+  # During Debian upgrades, it is possible that rails is not available (e.g.
+  # Lenny -> Squeeze), so the programs below might fail. If they do, we fall
+  # back to stopping the daemons by manually reading their PID files, killing
+  # them and wiping the PID files.
+
+  ruby -S thin -C config/thin.yml stop ||
+    stop_via_pid_file tmp/pids/thin.*.pid
+
+  ./script/delayed_job stop ||
+    stop_via_pid_file tmp/pids/delayed_job.pid
+
+  ./script/feed-updater stop ||
+    stop_via_pid_file tmp/pids/feed-updater.default.pid
+
+  ./script/ferret_server -e $RAILS_ENV stop ||
+    stop_via_pid_file tmp/pids/ferret.production.pid
+}
+
+stop_via_pid_file() {
+  for pidfile in $@; do
+    if [ -e "$pidfile" ]; then
+      pid=$(cat $pidfile)
+      echo "Sentign TERM signal to stop $pid ..."
+      kill -TERM "$pid"
+      rm -f $pidfile
+    fi
+  done
 }
  
 environments_loop() {
@@ -1033,14 +1033,43 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
  
-  should "not remove an activity of another user" do
-    login_as(profile.identifier)
-    p1 = fast_create(Person)
-    at = fast_create(ActionTracker::Record, :user_id => p1.id)
-    atn = fast_create(ActionTrackerNotification, :profile_id => p1.id, :action_tracker_id => at.id) 
-    count = ActionTrackerNotification.count
-    post :remove_activity, :profile => profile.identifier, :activity_id => at.id
-    assert_equal count, ActionTrackerNotification.count
+  should "remove an activity of another person if user has permissions to edit it" do
+    user = create_user('owner').person
+    login_as(user.identifier)
+    owner = create_user('owner').person
+    activity = fast_create(ActionTracker::Record, :user_id => owner.id)
+    @controller.stubs(:user).returns(user)
+    @controller.stubs(:profile).returns(owner)
+
+    assert_no_difference ActionTracker::Record, :count do
+      post :remove_activity, :profile => owner.identifier, :activity_id => activity.id
+    end
+
+    owner.environment.add_admin(user)
+
+    assert_difference ActionTracker::Record, :count, -1 do
+      post :remove_activity, :profile => owner.identifier, :activity_id => activity.id
+    end
+  end
+
+  should "remove a notification of another profile if user has permissions to edit it" do
+    user = create_user('owner').person
+    login_as(user.identifier)
+    profile = fast_create(Profile)
+    activity = fast_create(ActionTracker::Record, :user_id => user.id)
+    fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => activity.id)
+    @controller.stubs(:user).returns(user)
+    @controller.stubs(:profile).returns(profile)
+
+    assert_no_difference ActionTrackerNotification, :count do
+      post :remove_notification, :profile => profile.identifier, :activity_id => activity.id
+    end
+
+    profile.environment.add_admin(user)
+
+    assert_difference ActionTrackerNotification, :count, -1 do
+      post :remove_activity, :profile => profile.identifier, :activity_id => activity.id
+    end
   end
  
   should "not show the scrap button on network activity if the user don't follow the user" do
@@ -157,4 +157,22 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'not count articles if the user can\'t see them' do
+    person = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
+    block = fast_create(BlogArchivesBlock)
+
+    feed = mock()
+    feed.stubs(:url).returns('feed_url')
+    blog.stubs(:feed).returns(feed)
+    block.stubs(:blog).returns(blog)
+    block.stubs(:owner).returns(profile)
+
+    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
+    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
+
+    assert_match /January \(1\)/, block.content({:person => person})
+    assert_match /January \(1\)/, block.content()
+    assert_match /January \(2\)/, block.content({:person => profile})
+  end
 end
...	...	@@ -211,7 +211,8 @@ class ProfileController < PublicController
211	211
212	212	def remove_activity
213	213	begin
214		- activity = current_person.tracked_actions.find(params[:activity_id])
	214	+ raise if !can_edit_profile
	215	+ activity = ActionTracker::Record.find(params[:activity_id])
215	216	activity.destroy
216	217	render :text => _('Activity successfully removed.')
217	218	rescue
...	...	@@ -219,6 +220,17 @@ class ProfileController < PublicController
219	220	end
220	221	end
221	222
	223	+ def remove_notification
	224	+ begin
	225	+ raise if !can_edit_profile
	226	+ notification = ActionTrackerNotification.find(:first, :conditions => {:profile_id => profile.id, :action_tracker_id => params[:activity_id]})
	227	+ notification.destroy
	228	+ render :text => _('Notification successfully removed.')
	229	+ rescue
	230	+ render :text => _('You could not remove this notification.')
	231	+ end
	232	+ end
	233	+
222	234	def profile_info
223	235	begin
224	236	@block = profile.blocks.find(params[:block_id])
...	...	@@ -320,4 +332,8 @@ class ProfileController < PublicController
320	332	20
321	333	end
322	334
	335	+ def can_edit_profile
	336	+ @can_edit_profile \|\|= user && user.has_permission?('edit_profile', profile)
	337	+ end
	338	+ helper_method :can_edit_profile
323	339	end
...	...
...	...	@@ -81,8 +81,8 @@ module BoxesHelper
81	81	box_decorator == DontMoveBlocks
82	82	end
83	83
84		- def display_block_content(block, main_content = nil)
85		- content = block.main? ? wrap_main_content(main_content) : block.content
	84	+ def display_block_content(block, person, main_content = nil)
	85	+ content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
86	86	result = extract_block_content(content)
87	87	footer_content = extract_block_content(block.footer)
88	88	unless footer_content.blank?
...	...
...	...	@@ -8,7 +8,7 @@ class ArticleBlock < Block
8	8	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
9	9	end
10	10
11		- def content
	11	+ def content(args={})
12	12	block = self
13	13	lambda do
14	14	block_title(block.title) +
...	...
...	...	@@ -81,7 +81,7 @@ class Block < ActiveRecord::Base
81	81	# The method can also return <tt>nil</tt>, which means "no content".
82	82	#
83	83	# See BoxesHelper#extract_block_content for implementation details.
84		- def content
	84	+ def content(args={})
85	85	"This is block number %d" % self.id
86	86	end
87	87
...	...
...	...	@@ -20,11 +20,15 @@ class BlogArchivesBlock < Block
20	20	blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
21	21	end
22	22
23		- def content
	23	+ def visible_posts(person)
	24	+ blog.posts.native_translations.select {\|post\| post.display_to?(person)}
	25	+ end
	26	+
	27	+ def content(args={})
24	28	owner_blog = self.blog
25	29	return nil unless owner_blog
26	30	results = ''
27		- owner_blog.posts.native_translations.group_by {\|i\| i.published_at.year }.sort_by { \|year,count\| -year }.each do \|year, results_by_year\|
	31	+ visible_posts(args[:person]).group_by {\|i\| i.published_at.year }.sort_by { \|year,count\| -year }.each do \|year, results_by_year\|
28	32	results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
29	33	results << "<ul class='#{year}-archive'>"
30	34	results_by_year.group_by{\|i\| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do \|month, results_by_month\|
...	...
...	...	@@ -28,7 +28,7 @@ class CategoriesBlock < Block
28	28	Category.top_level_for(self.owner).from_types(self.category_types)
29	29	end
30	30
31		- def content
	31	+ def content(args={})
32	32	block = self
33	33	lambda do
34	34	render :file => 'blocks/categories', :locals => { :block => block }
...	...
...	...	@@ -12,7 +12,7 @@ class DisabledEnterpriseMessageBlock < Block
12	12	_('Message')
13	13	end
14	14
15		- def content
	15	+ def content(args={})
16	16	message = self.owner.environment.message_for_disabled_enterprise \|\| ''
17	17	lambda do
18	18	render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
...	...
...	...	@@ -12,7 +12,7 @@ class EnvironmentStatisticsBlock < Block
12	12	_('This block presents some statistics about your environment.')
13	13	end
14	14
15		- def content
	15	+ def content(args={})
16	16	users = owner.people.visible.count
17	17	enterprises = owner.enterprises.visible.count
18	18	communities = owner.communities.visible.count
...	...
...	...	@@ -25,7 +25,7 @@ class FeaturedProductsBlock < Block
25	25	self.owner.highlighted_products_with_image
26	26	end
27	27
28		- def content
	28	+ def content(args={})
29	29	block = self
30	30	lambda do
31	31	render :file => 'blocks/featured_products', :locals => { :block => block }
...	...
...	...	@@ -78,7 +78,7 @@ class FeedReaderBlock < Block
78	78	self.save!
79	79	end
80	80
81		- def content
	81	+ def content(args={})
82	82	block_title(title) + formatted_feed_content
83	83	end
84	84
...	...