Merge branch 'stable'

Conflicts: app/views/themes/index.rhtml db/schema.rb plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb test/unit/person_test.rb

Merge branch 'stable'
Conflicts: app/views/themes/index.rhtml db/schema.rb plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb test/unit/person_test.rb
Rodrigo Souto
2 parents 67fdc2f1 ca78d2e2
Showing 75 changed files with 665 additions and 233 deletions Show diff stats
app/helpers/cache_counter_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/models/comment.rb
app/models/contact.rb
app/models/environment.rb
app/models/friendship.rb
app/models/layout_template.rb
app/models/mailing.rb
app/models/organization.rb
app/models/organization_mailing.rb
app/models/pending_task_notifier.rb
app/models/person.rb
app/models/profile.rb
app/models/scrap.rb
app/models/task_mailer.rb
app/models/theme.rb
app/models/uploaded_file.rb
app/models/user.rb
app/views/admin_panel/_site_info.rhtml
@@ -0,0 +1,7 @@
+module CacheCounterHelper
+  def update_cache_counter(name, object, value)
+    if object.present?
+      object.class.update_counters(object.id, name => value)
+    end
+  end
+end
@@ -2,7 +2,6 @@ module CommentHelper
  
   def article_title(article, args = {})
     title = article.title
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog?
       unless args[:no_link]
@@ -14,8 +14,7 @@ module ContentViewerHelper
   end
  
   def article_title(article, args = {})
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
-    title = article.title if title.blank?
+    title = article.title
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
@@ -172,7 +172,7 @@ class Comment &lt; ActiveRecord::Base
     def mail(comment)
       profile = comment.article.profile
       recipients comment.notification_emails
-      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
         :sender => comment.author_name,
@@ -187,7 +187,7 @@ class Comment &lt; ActiveRecord::Base
     def mail_to_followers(comment, emails)
       profile = comment.article.profile
       bcc emails
-      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
       subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
       body :recipient => profile.nickname || profile.name,
         :sender => comment.author_name,
@@ -26,7 +26,7 @@ class Contact &lt; ActiveRecord::Base #WithoutTable
       content_type 'text/html'
       emails = contact.dest.notification_emails
       recipients emails
-      from "#{contact.name} <#{contact.dest.environment.contact_email}>"
+      from "#{contact.name} <#{contact.dest.environment.noreply_email}>"
       reply_to contact.email
       if contact.sender
         headers 'X-Noosfero-Sender' => contact.sender.identifier
@@ -606,7 +606,7 @@ class Environment &lt; ActiveRecord::Base
   # only one environment can be the default one
   validates_uniqueness_of :is_default, :if => (lambda do |environment| environment.is_default? end), :message => N_('Only one Virtual Community can be the default one')
  
-  validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |record| ! record.contact_email.blank? })
+  validates_format_of :contact_email, :noreply_email, :with => Noosfero::Constants::EMAIL_FORMAT, :allow_blank => true
  
   xss_terminate :only => [ :message_for_disabled_enterprise ], :with => 'white_list', :on => 'validation'
  
@@ -793,7 +793,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
   end
  
   after_create :create_templates
 class Friendship < ActiveRecord::Base
   track_actions :new_friendship, :after_create, :keep_params => ["friend.name", "friend.url", "friend.profile_custom_icon"], :custom_user => :person
-  
+
+  extend CacheCounterHelper
+
   belongs_to :person, :foreign_key => :person_id
   belongs_to :friend, :class_name => 'Person', :foreign_key => 'friend_id'
+
+  after_create do |friendship|
+    update_cache_counter(:friends_count, friendship.person, 1)
+    update_cache_counter(:friends_count, friendship.friend, 1)
+  end
+
+  after_destroy do |friendship|
+    update_cache_counter(:friends_count, friendship.person, -1)
+    update_cache_counter(:friends_count, friendship.friend, -1)
+  end
 end
@@ -16,15 +16,15 @@ class LayoutTemplate
   end
  
   def name
-    @config['name']
+    _ @config['name']
   end
  
   def title
-    @config['title']
+    _ @config['title']
   end
  
   def description
-    @config['description']
+    _ @config['description']
   end
  
   def number_of_boxes
@@ -17,7 +17,7 @@ class Mailing &lt; ActiveRecord::Base
   end
  
   def generate_from
-    "#{source.name} <#{source.contact_email}>"
+    "#{source.name} <#{if source.is_a? Environment then source.noreply_email else source.contact_email end}>"
   end
  
   def generate_subject
@@ -26,18 +26,7 @@ class Organization &lt; Profile
  
   has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
  
-  named_scope :more_popular,
-    :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
-    :group => Profile.qualified_column_names,
-    :joins => "LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id",
-    :order => "total DESC"
-
-  named_scope :more_active,
-    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
-    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id",
-    :group => Profile.qualified_column_names,
-    :order => 'total DESC',
-    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :more_popular, :order => 'members_count DESC'
  
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
 class OrganizationMailing < Mailing
  
   def generate_from
-    "#{person.name} <#{source.environment.contact_email}>"
+    "#{person.name} <#{source.environment.noreply_email}>"
   end
  
   def recipients(offset=0, limit=100)
@@ -2,7 +2,7 @@ class PendingTaskNotifier &lt; ActionMailer::Base
  
   def notification(person)
     recipients person.email
-    from "#{person.environment.name} <#{person.environment.contact_email}>"
+    from "#{person.environment.name} <#{person.environment.noreply_email}>"
     subject _("[%s] Pending tasks") % person.environment.name
     body :person => person,
       :tasks => person.tasks.pending,
@@ -71,18 +71,7 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
  
-  named_scope :more_popular,
-      :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
-      :group => Profile.qualified_column_names,
-      :joins => "LEFT OUTER JOIN friendships on profiles.id = friendships.person_id",
-      :order => "total DESC"
-
-  named_scope :more_active,
-    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
-    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id",
-    :group => Profile.qualified_column_names,
-    :order => 'total DESC',
-    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :more_popular, :order => 'friends_count DESC'
  
   named_scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
   named_scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
@@ -92,10 +92,6 @@ class Profile &lt; ActiveRecord::Base
     members.order(:name)
   end
  
-  def members_count
-    members.count
-  end
-
   class << self
     def count_with_distinct(*args)
       options = args.last || {}
@@ -118,10 +114,11 @@ class Profile &lt; ActiveRecord::Base
  
   named_scope :visible, :conditions => { :visible => true }
   named_scope :public, :conditions => { :visible => true, :public_profile => true }
-  # Subclasses must override these methods
+
+  # Subclasses must override this method
   named_scope :more_popular
-  named_scope :more_active
  
+  named_scope :more_active,  :order => 'activities_count DESC'
   named_scope :more_recent, :order => "created_at DESC"
  
   acts_as_trackable :dependent => :destroy
@@ -616,10 +613,10 @@ private :generate_url, :url_options
   # Adds a person as member of this Profile.
   def add_member(person)
     if self.has_members?
-      if self.closed? && members_count > 0
+      if self.closed? && members.count > 0
         AddMember.create!(:person => person, :organization => self) unless self.already_request_membership?(person)
       else
-        self.affiliate(person, Profile::Roles.admin(environment.id)) if members_count == 0
+        self.affiliate(person, Profile::Roles.admin(environment.id)) if members.count == 0
         self.affiliate(person, Profile::Roles.member(environment.id))
       end
     else
@@ -14,7 +14,7 @@ class Scrap &lt; ActiveRecord::Base
  
   named_scope :not_replies, :conditions => {:scrap_id => nil}
  
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target 
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
  
   track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
  
@@ -59,7 +59,7 @@ class Scrap &lt; ActiveRecord::Base
       sender, receiver = scrap.sender, scrap.receiver
       recipients receiver.email
  
-      from "#{sender.environment.name} <#{sender.environment.contact_email}>"
+      from "#{sender.environment.name} <#{sender.environment.noreply_email}>"
       subject _("[%s] You received a scrap!") % [sender.environment.name]
       body :recipient => receiver.name,
         :sender => sender.name,
@@ -60,7 +60,7 @@ class TaskMailer &lt; ActionMailer::Base
   end
  
   def self.generate_from(task)
-    "#{task.environment.name} <#{task.environment.contact_email}>"
+    "#{task.environment.name} <#{task.environment.noreply_email}>"
   end
  
   def generate_environment_url(task, url = {})
@@ -42,17 +42,25 @@ class Theme
     end
  
     def approved_themes(owner)
-      Dir.glob(File.join(system_themes_dir, '*')).select do |item|
-        if File.exists?( File.join(item, 'theme.yml') )
-          config = YAML.load_file(File.join(item, 'theme.yml'))
-          (config['owner_type'] == owner.class.base_class.name) &&
-          (config['owner_id'] == owner.id) || config['public']
+      Dir.glob(File.join(system_themes_dir, '*')).map do |item|
+        next unless File.exists? File.join(item, 'theme.yml')
+        id = File.basename item
+        config = YAML.load_file File.join(item, 'theme.yml')
+
+        approved = config['public']
+        unless approved
+          begin
+            approved = owner.kind_of?(config['owner_type'].constantize)
+          rescue
+          end
+          approved &&= config['owner_id'] == owner.id if config['owner_id'].present?
         end
-      end.map do |desc|
-        new(File.basename(desc))
+
+        [id, config] if approved
+      end.compact.map do |id, config|
+        new id, config
       end
     end
-
   end
  
   class DuplicatedIdentifier < Exception; end
@@ -12,15 +12,12 @@ class UploadedFile &lt; Article
  
   include ShortFilename
  
-  settings_items :title, :type => 'string'
-  xss_terminate :only => [ :title ]
-
-  def title_with_default
-    title_without_default || short_filename(name, 60)
+  def title
+    if self.name.present? then self.name else self.filename end
+  end
+  def title= value
+    self.name = value
   end
-  alias_method_chain :title, :default
-
-  validates_size_of :title, :maximum => 60, :if => (lambda { |file| !file.title.blank? })
  
   sanitize_filename
  
@@ -32,10 +29,6 @@ class UploadedFile &lt; Article
     self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
  
-  def display_title
-    title.blank? ? name : title
-  end
-
   def first_paragraph
     ''
   end
@@ -109,7 +102,7 @@ class UploadedFile &lt; Article
   alias :orig_set_filename :filename=
   def filename=(value)
     orig_set_filename(value)
-    self.name = self.filename
+    self.name ||= self.filename
   end
  
   def download_headers
@@ -54,7 +54,7 @@ class User &lt; ActiveRecord::Base
     def activation_email_notify(user)
       user_email = "#{user.login}@#{user.email_domain}"
       recipients user_email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
       body :name => user.name,
         :email => user_email,
@@ -66,7 +66,7 @@ class User &lt; ActiveRecord::Base
     def activation_code(user)
       recipients user.email
  
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject _("[%s] Activate your account") % [user.environment.name]
       body :recipient => user.name,
         :activation_code => user.activation_code,
@@ -82,7 +82,7 @@ class User &lt; ActiveRecord::Base
       content_type 'text/html'
       recipients user.email
  
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
       body email_body
     end
 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
 <%= labelled_form_field(_('Contact email'), text_field(:environment, :contact_email)) %>
+<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <div class="vcard">
  
-<p><%= block.title %></p>
+<% if block.title.present? %>
+  <p><%= block.title %></p>
+<% end %>
  
 <div class="profile-big-image">
   <div class="profile-big-image-inner1">
@@ -12,7 +12,7 @@
           "/designs/templates/#{template.id}/thumbnail.png",
           :alt => _('The "%s" template')) +
         '<div class="opt-info">'.html_safe +
-        content_tag('strong', template.name, :class => 'name') +
+        content_tag('strong', template.name, :title => template.title, :class => 'name') +
         ' <br/> '.html_safe
  
         if @current_template == template.id  # selected
@@ -0,0 +1,4 @@
+job = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%ActivitiesCounterCacheJob%"]
+if job.blank?
+  Delayed::Backend::ActiveRecord::Job.enqueue(ActivitiesCounterCacheJob.new, -3)
+end
 Delayed::Worker.backend = :active_record
 Delayed::Worker.max_attempts = 2
-Delayed::Worker.max_run_time = 10.minutes
+
+# TODO This is consuming ton of space on development with a postgres connection
+# error on the jobs. This must be verified before going into production.
+# Logging jobs backtraces
+#class Delayed::Worker
+#  def handle_failed_job_with_loggin(job, error)
+#    handle_failed_job_without_loggin(job,error)
+#    Delayed::Worker.logger.error(error.message)
+#    Delayed::Worker.logger.error(error.backtrace.join("\n"))
+#  end
+#  alias_method_chain :handle_failed_job, :loggin
+#end
@@ -0,0 +1,2 @@
+require 'noosfero/role_assignment_ext'
+require 'noosfero/action_tracker_ext'
@@ -0,0 +1,12 @@
+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
+  def self.up
+    UploadedFile.find_each do |uploaded_file|
+      uploaded_file.name = uploaded_file.setting.delete :title
+      uploaded_file.send :update_without_callbacks
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,16 @@
+class MoveContactEmailToNoreplyEmailAtEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :noreply_email, :string
+    Environment.reset_column_information
+
+    Environment.find_each do |environment|
+      environment.noreply_email = environment.contact_email
+      environment.contact_email = nil
+      environment.save!
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,13 @@
+class AddIndexesForArticleSearch < ActiveRecord::Migration
+  def self.up
+    add_index :articles, :created_at
+    add_index :articles, :hits
+    add_index :articles, :comments_count
+  end
+
+  def self.down
+    remove_index :articles, :created_at
+    remove_index :articles, :hits
+    remove_index :articles, :comments_count
+  end
+end
@@ -0,0 +1,9 @@
+class AddIndexesForProfileSearch < ActiveRecord::Migration
+  def self.up
+    add_index :profiles, :created_at
+  end
+
+  def self.down
+    remove_index :profiles, :created_at
+  end
+end
@@ -0,0 +1,19 @@
+class CreateCacheCountsForProfiles < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :friends_count, :integer, :null => false, :default => 0
+    add_column :profiles, :members_count, :integer, :null => false,  :default => 0
+    add_column :profiles, :activities_count, :integer, :null => false,  :default => 0
+    add_index :profiles, :friends_count
+    add_index :profiles, :members_count
+    add_index :profiles, :activities_count
+  end
+
+  def self.down
+    remove_column :profiles, :friends_count
+    remove_column :profiles, :members_count
+    remove_column :profiles, :activities_count
+    remove_index :profiles, :friends_count
+    remove_index :profiles, :members_count
+    remove_index :profiles, :activities_count
+  end
+end
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesFriendsCount < ActiveRecord::Migration
+  def self.up
+    friends_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles INNER JOIN friendships ON ( profiles.id = friendships.friend_id AND profiles.type = E'Person') GROUP BY profiles.id;")
+    friends_counts.each do |count|
+      execute("UPDATE profiles SET friends_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET friends_count=0;")
+  end
+end
@@ -0,0 +1,14 @@
+class DefineInitialValueForProfilesActivitiesCount < ActiveRecord::Migration
+  def self.up
+    person_activities_counts = execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= '#{30.days.ago.to_s(:db)}') AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
+    organization_activities_counts = execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= '#{30.days.ago.to_s(:db)}') AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
+    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
+    activities_counts.each do |count|
+      execute("UPDATE profiles SET activities_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+    execute("UPDATE profiles SET activities_count=0;")
+  end
+end
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesMembersCount < ActiveRecord::Migration
+   def self.up
+    members_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id WHERE (profiles.type = 'Organization' OR profiles.type = 'Community' OR profiles.type = 'Enterprise') GROUP BY profiles.id;")
+    members_counts.each do |count|
+      execute("UPDATE profiles SET members_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET members_count=0;")
+  end
+end
@@ -0,0 +1,9 @@
+class AddIndexesForProductsSearch < ActiveRecord::Migration
+  def self.up
+    add_index :products, :created_at
+  end
+
+  def self.down
+    remove_index :products, :created_at
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20140312184749) do
+ActiveRecord::Schema.define(:version => 20140314200103) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -140,6 +140,9 @@ ActiveRecord::Schema.define(:version =&gt; 20140312184749) do
     t.integer  "position"
   end
  
+  add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
+  add_index "articles", ["created_at"], :name => "index_articles_on_created_at"
+  add_index "articles", ["hits"], :name => "index_articles_on_hits"
   add_index "articles", ["name"], :name => "index_articles_on_name"
   add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
   add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
@@ -283,6 +286,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140312184749) do
     t.string   "languages"
     t.string   "default_language"
     t.string   "redirection_after_signup",     :default => "keep_on_same_page"
+    t.string   "noreply_email"
   end
  
   create_table "external_feeds", :force => true do |t|
@@ -433,6 +437,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140312184749) do
     t.boolean  "archived",            :default => false
   end
  
+  add_index "products", ["created_at"], :name => "index_products_on_created_at"
+  add_index "products", ["enterprise_id"], :name => "index_products_on_enterprise_id"
   add_index "products", ["product_category_id"], :name => "index_products_on_product_category_id"
   add_index "products", ["profile_id"], :name => "index_products_on_profile_id"
  
@@ -471,10 +477,17 @@ ActiveRecord::Schema.define(:version =&gt; 20140312184749) do
     t.string   "redirection_after_login"
     t.string   "personal_website"
     t.string   "jabber_id"
+    t.integer  "friends_count",                         :default => 0,     :null => false
+    t.integer  "members_count",                         :default => 0,     :null => false
+    t.integer  "activities_count",                      :default => 0,     :null => false
   end
  
+  add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
+  add_index "profiles", ["created_at"], :name => "index_profiles_on_created_at"
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+  add_index "profiles", ["friends_count"], :name => "index_profiles_on_friends_count"
   add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
+  add_index "profiles", ["members_count"], :name => "index_profiles_on_members_count"
   add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
  
   create_table "qualifier_certifiers", :force => true do |t|
+noosfero (0.46.2) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 19 Mar 2014 23:41:06 +0000
+
 noosfero (0.46.1) unstable; urgency=low
  
   * Bugfixes release
@@ -0,0 +1,11 @@
+class ActivitiesCounterCacheJob
+  def perform
+    person_activities_counts = ActiveRecord::Base.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= '#{ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db)}') AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
+    organization_activities_counts = ActiveRecord::Base.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= '#{ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db)}') AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
+    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
+    activities_counts.each do |count|
+      ActiveRecord::Base.connection.execute("UPDATE profiles SET activities_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+    Delayed::Job.enqueue(ActivitiesCounterCacheJob.new, -3, 1.day.from_now)
+  end
+end
@@ -24,8 +24,8 @@ class FeedUpdater
       environment = Environment.default
  
       recipients NOOSFERO_CONF['exception_recipients']
-      from       environment.contact_email
-      reply_to   environment.contact_email
+      from       environment.noreply_email
+      reply_to   environment.noreply_email
       subject    "[#{environment.name}] Feed-updater: #{error.message}"
       body       render(:text => "
 Container:
@@ -13,6 +13,10 @@ class FilePresenter
     klass.accepts?(f) ? klass.new(f) : f
   end
  
+  def self.base_class
+    Article
+  end
+
   def initialize(f)
     @file = f
   end
@@ -31,6 +35,10 @@ class FilePresenter
     self
   end
  
+  def kind_of?(klass)
+    @file.kind_of?(klass)
+  end
+
   # This method must be overridden in subclasses.
   #
   # If the class accepts the file, return a number that represents the
@@ -43,7 +51,12 @@ class FilePresenter
   end
  
   def short_description
-    _("File (%s)") % content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+    file_type = if content_type.present?
+      content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+    else
+      _('Unknown')
+    end
+    _("File (%s)") % file_type
   end
  
   # Define the css classes to style the page fragment with the file related
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.46.1'
+  VERSION = '0.46.2'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -0,0 +1,21 @@
+Rails.configuration.to_prepare do
+  ActionTracker::Record.module_eval do
+    extend CacheCounterHelper
+
+    after_create do |record|
+      update_cache_counter(:activities_count, record.user, 1)
+      if record.target.kind_of?(Organization)
+        update_cache_counter(:activities_count, record.target, 1)
+      end
+    end
+
+    after_destroy do |record|
+      if record.created_at >= ActionTracker::Record::RECENT_DELAY.days.ago
+        update_cache_counter(:activities_count, record.user, -1)
+        if record.target.kind_of?(Organization)
+          update_cache_counter(:activities_count, record.target, -1)
+        end
+      end
+    end
+  end
+end
@@ -0,0 +1,29 @@
+Rails.configuration.to_prepare do
+  RoleAssignment.module_eval do
+    extend CacheCounterHelper
+
+    after_create do |role_assignment|
+      accessor = role_assignment.accessor
+      resource = role_assignment.resource
+      if resource.kind_of?(Organization)
+        #FIXME This will only work as long as the role_assignment associations
+        #happen only between profiles, due to the polymorphic column type.
+        if resource.role_assignments.where(:accessor_id => accessor.id).count == 1
+          update_cache_counter(:members_count, resource, 1)
+        end
+      end
+    end
+
+    after_destroy do |role_assignment|
+      accessor = role_assignment.accessor
+      resource = role_assignment.resource
+      if resource.kind_of?(Organization)
+        #FIXME This will only work as long as the role_assignment associations
+        #happen only between profiles, due to the polymorphic column type.
+        if resource.role_assignments.where(:accessor_id => accessor.id).count == 0
+          update_cache_counter(:members_count, resource, -1)
+        end
+      end
+    end
+  end
+end
@@ -3,7 +3,7 @@ module SendEmailPluginBaseController
     if request.post?
       @context_url = profile ? profile.url : {:host => environment.default_hostname, :controller => 'home'}
       @mail = SendEmailPlugin::Mail.new(
-        :from => environment.contact_email,
+        :from => environment.noreply_email,
         :to => params[:to],
         :message => params[:message],
         :environment => environment,
 <h1> <%= _('Basket options') %> </h1>
  
 <% form_for(:settings, @settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
-  <%= labelled_form_field(_('Enabled?'), f.check_box(:enabled)) %>
-  <%= labelled_form_field(_('Delivery?'), f.check_box(:delivery)) %>
+  <%= labelled_form_field(_('Enable shopping basket'), f.check_box(:enabled)) %>
+  <%= labelled_form_field(_('Enable delivery fields on orders'), f.check_box(:delivery)) %>
   <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %>
   <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend>
     <table>
@@ -34,7 +34,7 @@
     </table>
  
     <%= labelled_form_field(_("Order's minimum price for free delivery:"), f.text_field(:free_delivery_price)) %>
-    <%= content_tag('small', _('Empty stands for no minimum price for free delivery.')) %>
+    <%= content_tag('small', _('Leave empty to always charge the delivery.')) %>
   </fieldset>
   <br style='clear: both'/>
   <br style='clear: both'/>
@@ -2,7 +2,7 @@ class SpaminatorPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
  
   def inactive_person_notification(person)
     recipients    person.email
-    from          "#{person.environment.name} <#{person.environment.contact_email}>"
+    from          "#{person.environment.name} <#{person.environment.noreply_email}>"
     subject       _("[%s] You must reactivate your account.") % person.environment.name
     content_type  'text/html'
     body :person => person,
@@ -14,7 +14,7 @@ class SpaminatorPlugin::MailerTest &lt; ActiveSupport::TestCase
   attr_accessor :environment, :settings
  
   should 'be able to send a inactive person notification message' do
-    environment.contact_email = 'no-reply@noosfero.org'
+    environment.noreply_email = 'no-reply@noosfero.org'
     environment.save
  
     person = create_user('spammer').person
@@ -5,8 +5,7 @@ class ToleranceTimePlugin::Publication &lt; Noosfero::Plugin::ActiveRecord
  
   class << self
     def find_by_target(target)
-      kind = target.kind_of?(Article) ? 'Article' : 'Comment'
-      find_by_target_id_and_target_type(target.id, kind)
+      find_by_target_id_and_target_type(target.id, target.class.base_class.name)
     end
   end
  
@@ -2875,6 +2875,30 @@ msgstr &quot;Artigo de texto com linguagem de marcação Textile&quot;
 msgid "Accessible alternative for visually impaired users."
 msgstr "Alternativa acessível para usuários com deficiência visual."
  
+#: app/models/layout_template.rb
+msgid "Left Bar"
+msgstr "Uma barra à esquerda"
+
+#: app/models/layout_template.rb
+msgid "2 Left Bars"
+msgstr "Duas barras à esquerda"
+
+#: app/models/layout_template.rb
+msgid "Left and Bottom Bar"
+msgstr "Uma barra à esquerda e outra ao final"
+
+#: app/models/layout_template.rb
+msgid "Right Bar"
+msgstr "Uma barra à direita"
+
+#: app/models/layout_template.rb
+msgid "Default"
+msgstr "Padrão"
+
+#: app/models/layout_template.rb
+msgid "No Sidebars"
+msgstr "Nenhuma barra lateral"
+
 #: app/models/login_block.rb:4
 msgid "Login/logout"
 msgstr "Login/Sair"
@@ -7219,8 +7243,8 @@ msgstr &quot;Funcionalidade&quot;
  
 #: app/views/features/index.rhtml:16
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:4
-msgid "Enabled?"
-msgstr "Habilitada?"
+msgid "Enable shopping basket"
+msgstr "Habilitar cesto de compras"
  
 #: app/views/features/index.rhtml:27
 msgid "Configure features"
@@ -12462,8 +12486,8 @@ msgid &quot;Basket options&quot;
 msgstr "Opções do cesto"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:5
-msgid "Delivery?"
-msgstr "Entrega?"
+msgid "Enable delivery fields on orders"
+msgstr "Ativar campos de entrega para pedidos"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10
 msgid "Option"
@@ -12480,12 +12504,12 @@ msgid &quot;ADD NEW OPTION&quot;
 msgstr "ADCIONAR NOVA OPÇÂO"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36
-msgid "Free delivery price:"
-msgstr "Preço de entrega grátis:"
+msgid "Order's minimum price for free delivery:"
+msgstr "Preço mínimo do pedido para entrega grátis:"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37
-msgid "Empty stands for no free delivery price."
-msgstr "Vazio significa sem preço de frete grátis."
+msgid "Leave empty to always charge the delivery."
+msgstr "Deixe vazio para sempre cobrar a entrega."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb:1
 msgid "Purchase Reports"
-name: "Left and Bottom bar"
+name: "Left and Bottom Bar"
 title: "Style 2 columns and a box at bottom of content"
 description: "A theme with 2 columns and a box below the content"
 number_of_boxes: 3
-name: "No Side Bars"
+name: "No Sidebars"
 title: "No sidebars, only content"
 description: "A template without sidebars, only content"
 number_of_boxes: 1
@@ -741,16 +741,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'li', :attributes => {:title => 'my img title', :class => 'image-gallery-item'}, :child => {:tag => 'span', :content => 'my img title'}
   end
  
-  should 'not allow html on title of the images' do
-    login_as(profile.identifier)
-    folder = fast_create(Gallery, :profile_id => profile.id)
-    file = UploadedFile.create!(:title => '<b>my img title</b>', :profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-
-    get :view_page, :profile => profile.identifier, :page => folder.explode_path
-
-    assert_tag :tag => 'li', :attributes => {:title => 'my img title', :class => 'image-gallery-item'}, :child => {:tag => 'span', :content => 'my img title'}
-  end
-
   should 'allow publisher owner view private articles' do
     c = Community.create!(:name => 'test_com')
     u = create_user_with_permission('test_user', 'publish_content', c)
@@ -230,7 +230,8 @@ class InviteControllerTest &lt; ActionController::TestCase
  
     contact_list = ContactList.create
     post :select_friends, :profile => profile.identifier, :manual_import_addresses => "#{friend.name} <#{friend.email}>", :import_from => "manual", :mail_template => "click: <url>", :contact_list => contact_list.id
-    assert_equal 'pt', Delayed::Job.first.payload_object.locale
+    job = Delayed::Job.where("handler LIKE '%InvitationJob%'").first
+    assert_equal 'pt', job.payload_object.locale
   end
  
   private
@@ -766,23 +766,28 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'see all the activities in the current profile network' do
-    p1= Person.first
+    p1= fast_create(Person)
     p2= fast_create(Person)
     assert !p1.is_a_friend?(p2)
+
     p3= fast_create(Person)
     p3.add_friend(p1)
     assert p3.is_a_friend?(p1)
-    ActionTracker::Record.destroy_all
+
+    ActionTracker::Record.delete_all
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
     Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
     a1 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
     Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
     a2 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
     Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
     a3 = ActionTracker::Record.last
  
-
     @controller.stubs(:logged_in?).returns(true)
     user = mock()
     user.stubs(:person).returns(p3)
@@ -792,24 +797,29 @@ class ProfileControllerTest &lt; ActionController::TestCase
  
     process_delayed_job_queue
     get :index, :profile => p1.identifier
-    assert_not_nil assigns(:network_activities)
-    assert_equal [], [a1,a3] - assigns(:network_activities)
-    assert_equal assigns(:network_activities) - [a1, a3], []
+
+    assert_equivalent [a1,a3].map(&:id), assigns(:network_activities).map(&:id)
   end
  
   should 'the network activity be visible only to profile followers' do
-    p1= Person.first
+    p1= fast_create(Person)
     p2= fast_create(Person)
     assert !p1.is_a_friend?(p2)
+
     p3= fast_create(Person)
     p3.add_friend(p1)
     assert p3.is_a_friend?(p1)
-    ActionTracker::Record.destroy_all
+
+    ActionTracker::Record.delete_all
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
     Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
     a1 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
     Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
     a2 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
     Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
     a3 = ActionTracker::Record.last
@@ -819,8 +829,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     user.stubs(:person).returns(p2)
     user.stubs(:login).returns('some')
     @controller.stubs(:current_user).returns(user)
+
     get :index, :profile => p1.identifier
-    assert_equal [], assigns(:network_activities)
+    assert assigns(:network_activities).blank?
  
     user = mock()
     user.stubs(:person).returns(p3)
@@ -828,9 +839,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller.stubs(:current_user).returns(user)
     Person.any_instance.stubs(:follows?).returns(true)
     process_delayed_job_queue
+
     get :index, :profile => p3.identifier
-    assert_equal [], [a1,a3] - assigns(:network_activities)
-    assert_equal assigns(:network_activities) - [a1, a3], []
+    assert_equivalent [a1,a3], assigns(:network_activities)
   end
  
   should 'the network activity be paginated' do
@@ -549,9 +549,9 @@ class SearchControllerTest &lt; ActionController::TestCase
     c2 = create(Community, :name => 'Testing community 2')
     c3 = create(Community, :name => 'Testing community 3')
     ActionTracker::Record.delete_all
-    fast_create(ActionTracker::Record, :target_id => c1, :user_type => 'Profile', :user_id => person, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :target_id => c2, :user_type => 'Profile', :user_id => person, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :target_id => c2, :user_type => 'Profile', :user_id => person, :created_at => Time.now)
+    ActionTracker::Record.create!(:target => c1, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
     get :communities, :filter => 'more_active'
     assert_equal [c2,c1,c3] , assigns(:searches)[:communities][:results]
   end
@@ -183,7 +183,7 @@ class ActiveSupport::TestCase
         if reference.first == value
           reference.shift
         else
-          assert false, "'#{value}' was found before it should be on: #{original.inspect}"
+          assert false, "'#{value.inspect}' was found before it should be on: #{original.inspect}"
         end
       end
     end
@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActionTrackerExtTest < ActiveSupport::TestCase
+  should 'increase person activities_count on new activity' do
+    person = fast_create(Person)
+    assert_difference person, :activities_count, 1 do
+      ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => fast_create(Profile)
+      person.reload
+    end
+  end
+
+  should 'decrease person activities_count on activity removal' do
+    person = fast_create(Person)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => fast_create(Profile)
+    person.reload
+    assert_difference person, :activities_count, -1 do
+      record.destroy
+      person.reload
+    end
+  end
+
+  should 'not decrease person activities_count on activity removal after the recent delay' do
+    person = fast_create(Person)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => fast_create(Profile)
+    record.created_at = record.created_at - ActionTracker::Record::RECENT_DELAY.days - 1.day
+    record.save!
+    person.reload
+    assert_no_difference person, :activities_count do
+      record.destroy
+      person.reload
+    end
+  end
+
+  should 'increase organization activities_count on new activity' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    assert_difference organization, :activities_count, 1 do
+      ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization
+      organization.reload
+    end
+  end
+
+  should 'decrease organization activities_count on activity removal' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization
+    organization.reload
+    assert_difference organization, :activities_count, -1 do
+      record.destroy
+      organization.reload
+    end
+  end
+
+  should 'not decrease organization activities_count on activity removal after the recent delay' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization, :created_at => (ActionTracker::Record::RECENT_DELAY + 1).days.ago
+    organization.reload
+    assert_no_difference organization, :activities_count do
+      record.destroy
+      organization.reload
+    end
+  end
+end
@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActivitiesCounterCacheJobTest < ActiveSupport::TestCase
+
+  should 'correctly update the person activities counter cache' do
+    person = create_user('person').person
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article')
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article')
+    person.reload
+    assert_equal 2, person.activities_count
+
+    person.activities_count = 0
+    person.save!
+    job = ActivitiesCounterCacheJob.new
+    job.perform
+    person.reload
+    assert_equal 2, person.activities_count
+  end
+
+  should 'correctly update the organization activities counter cache' do
+    person = create_user('person').person
+    organization = Organization.create!(:name => 'Organization1', :identifier => 'organization1')
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article', :target => organization)
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article', :target => organization)
+    organization.reload
+    assert_equal 2, organization.activities_count
+
+    organization.activities_count = 0
+    organization.save!
+    job = ActivitiesCounterCacheJob.new
+    job.perform
+    organization.reload
+    assert_equal 2, organization.activities_count
+  end
+
+end
@@ -1630,10 +1630,10 @@ class ArticleTest &lt; ActiveSupport::TestCase
  
   should 'not allow all community members to edit by default' do
     community = fast_create(Community)
-    admin = create_user('community-admin').person
-    member = create_user.person
-
+    admin = fast_create(Person)
+    member = fast_create(Person)
     community.add_admin(admin)
+    community.reload
     community.add_member(member)
     a = Article.new(:profile => community)
  
@@ -213,8 +213,8 @@ class CommunityTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     community.closed = true
     community.save
-
     community.add_member(fast_create(Person))
+    community.reload
  
     assert_difference AddMember, :count do
       community.add_member(person)
@@ -16,7 +16,7 @@ class ContactSenderTest &lt; ActiveSupport::TestCase
     ent.contact_email = 'contact@invalid.com'
     c = build(Contact, :dest => ent)
     response = Contact::Sender.deliver_mail(c)
-    assert_equal Environment.default.contact_email, response.from.to_s
+    assert_equal Environment.default.noreply_email.to_s, response.from.to_s
     assert_equal "[#{ent.name}] #{c.subject}", response.subject
   end
  
@@ -27,7 +27,7 @@ class ContactSenderTest &lt; ActiveSupport::TestCase
     response = Contact::Sender.deliver_mail(c)
     assert_includes response.to, c.dest.contact_email
   end
- 
+
   should 'deliver mail to admins of enterprise' do
     admin = create_user('admin_test').person
     ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
@@ -44,11 +44,14 @@ class ContactTest &lt; ActiveSupport::TestCase
     assert !c.deliver
   end
  
-  should 'use sender name and environment contact_email on from' do
+  should 'use sender name and environment noreply_email on from' do
     ent = fast_create(Enterprise, :name => 'my enterprise', :identifier => 'myent')
+    env = ent.environment
+    env.noreply_email = 'noreply@sample.org'
+    env.save!
     c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
     email = c.deliver
-    assert_equal "#{c.name} <#{ent.environment.contact_email}>", email['from'].to_s
+    assert_equal "#{c.name} <#{ent.environment.noreply_email}>", email['from'].to_s
   end
  
   should 'add dest name on subject' do
@@ -99,6 +99,7 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
     enterprise = fast_create(Enterprise)
     member = fast_create(Person)
     enterprise.add_member(member)
+    enterprise.reload
  
     person = fast_create(Person)
     enterprise.add_member(person)
@@ -46,7 +46,7 @@ class EnvironmentMailingTest &lt; ActiveSupport::TestCase
  
   should 'display name and email on generate_from' do
     mailing = EnvironmentMailing.new(:source => environment, :person => person_1)
-    assert_equal "#{environment.name} <#{environment.contact_email}>", mailing.generate_from
+    assert_equal "#{environment.name} <#{environment.noreply_email}>", mailing.generate_from
   end
  
   should 'deliver mailing to each recipient after create' do
@@ -58,4 +58,20 @@ class FilePresenterTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'pass kind_of? to the encapsulated file' do
+    f = FilePresenter.for(UploadedFile.new)
+    assert f.kind_of?(UploadedFile)
+  end
+
+  should 'not crash with uploaded_file short description without content_type' do
+    f = FilePresenter.for(UploadedFile.new)
+    assert_nothing_raised do
+      f.short_description
+    end
+  end
+
+  should 'show unknown type when file doesn\'t have a content_type' do
+    f = FilePresenter.for(UploadedFile.new)
+    assert_match /Unknown/, f.short_description
+  end
 end
@@ -74,7 +74,7 @@ class MailingTest &lt; ActiveSupport::TestCase
   should 'display name and email on generate_from' do
     person = Person['user_one']
     mailing = Mailing.new(:source => environment, :person => person)
-    assert_equal "#{environment.name} <#{environment.contact_email}>", mailing.generate_from
+    assert_equal "#{environment.name} <#{environment.noreply_email}>", mailing.generate_from
   end
  
   should 'generate subject' do
@@ -42,7 +42,7 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
  
   should 'display name and email on generate_from' do
     mailing = OrganizationMailing.new(:source => community, :person => person)
-    assert_equal "#{person.name} <#{community.environment.contact_email}>", mailing.generate_from
+    assert_equal "#{person.name} <#{community.environment.noreply_email}>", mailing.generate_from
   end
  
   should 'generate subject' do
@@ -62,18 +62,21 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
  
   should 'deliver mailing to each member after create' do
     mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    community.reload
     process_delayed_job_queue
     assert_equal 2, ActionMailer::Base.deliveries.count
   end
  
   should 'deliver mailing when there are many mailings created' do
     50.times { OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person) }
+    community.reload
     process_delayed_job_queue
     assert_equal 50*community.members_count, ActionMailer::Base.deliveries.count
   end
  
   should 'create mailing sent to each recipient after delivering mailing' do
     mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    community.reload
     assert_difference MailingSent, :count, 2 do
       process_delayed_job_queue
     end
@@ -302,18 +302,17 @@ class OrganizationTest &lt; ActiveSupport::TestCase
   end
  
   should 'find more popular organizations' do
-    Organization.delete_all
     o1 = fast_create(Organization)
     o2 = fast_create(Organization)
  
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     o1.add_member(p1)
-    assert_equal [o1,o2] , Organization.more_popular
+    assert_order [o1,o2] , Organization.more_popular
  
     o2.add_member(p1)
     o2.add_member(p2)
-    assert_equal [o2,o1] , Organization.more_popular
+    assert_order [o2,o1] , Organization.more_popular
   end
  
   should 'list organizations that have no members in more popular list' do
@@ -331,6 +330,7 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     person = fast_create(Person)
     organization = fast_create(Organization)
     organization.add_member(person)
+    organization.reload
  
     assert_equal "one member", organization.more_popular_label
   end
@@ -342,47 +342,30 @@ class OrganizationTest &lt; ActiveSupport::TestCase
  
     organization.add_member(person1)
     organization.add_member(person2)
+    organization.reload
     assert_equal "2 members", organization.more_popular_label
  
     person3 = fast_create(Person)
     organization.add_member(person3)
+    organization.reload
     assert_equal "3 members", organization.more_popular_label
   end
  
   should 'find more active organizations' do
     person = fast_create(Person)
-    Organization.destroy_all
     p1 = fast_create(Organization)
     p2 = fast_create(Organization)
     p3 = fast_create(Organization)
  
     ActionTracker::Record.destroy_all
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p1.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p2.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p2.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p3.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p3.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p3.id)
+    ActionTracker::Record.create!(:user => person, :target => p1, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p3, :verb => 'leave_scrap')
  
-    assert_equal [p3,p2,p1] , Organization.more_active
-  end
-
-  should 'more active profile take in consideration only actions created only in the recent delay interval' do
-    ActionTracker::Record.destroy_all
-    recent_delay = ActionTracker::Record::RECENT_DELAY.days.ago
-
-    person = fast_create(Person)
-    Organization.destroy_all
-    p1 = fast_create(Organization)
-    p2 = fast_create(Organization)
-
-    ActionTracker::Record.destroy_all
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay, :target_id => p1.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay, :target_id => p1.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay, :target_id => p2.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay - 1.day, :target_id => p2.id)
-
-    assert_equal [p1,p2] , Organization.more_active
+    assert_order [p3,p2,p1] , Organization.more_active
   end
  
   should 'list profiles that have no actions in more active list' do
@@ -422,4 +405,24 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     assert !organization.visible
   end
  
+  should 'increase members_count on new membership' do
+    member = fast_create(Person)
+    organization = fast_create(Organization)
+    assert_difference organization, :members_count, 1 do
+      organization.add_member(member)
+      organization.reload
+    end
+  end
+
+  should 'decrease members_count on membership removal' do
+    member = fast_create(Person)
+    organization = fast_create(Organization)
+    organization.add_member(member)
+    organization.reload
+    assert_difference organization, :members_count, -1 do
+      organization.remove_member(member)
+      organization.reload
+    end
+  end
+
 end
@@ -404,15 +404,14 @@ class PersonTest &lt; ActiveSupport::TestCase
  
   should 'not allow simple member to view group pending tasks' do
     community = fast_create(Community)
+    admin = fast_create(Person)
+    community.add_member(admin)
     member = fast_create(Person)
+    community.reload
     community.add_member(member)
-
     community.tasks << Task.new
  
-    person = fast_create(Person)
-    community.add_member(person)
-
-    assert_not_includes Person.with_pending_tasks, person
+    assert_not_includes Person.with_pending_tasks, member
   end
  
   should 'person has organization pending tasks' do
@@ -642,16 +641,18 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
  
   should 'find more popular people' do
+    extend CacheCounterHelper
+
     Person.delete_all
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
  
-    p1.add_friend(p2)
-    p2.add_friend(p1)
-    p2.add_friend(p3)
-    assert_equal p2, Person.more_popular[0]
-    assert_equal p1, Person.more_popular[1]
+    update_cache_counter(:friends_count, p1, 1)
+    update_cache_counter(:friends_count, p2, 2)
+    update_cache_counter(:friends_count, p3, 3)
+
+    assert_order [p3, p2, p1], Person.more_popular
   end
  
   should 'list people that have no friends in more popular list' do
@@ -891,6 +892,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
+    p4 = fast_create(Person)
  
     community.add_member(p1)
     assert p1.is_member_of?(community)
@@ -901,14 +903,15 @@ class PersonTest &lt; ActiveSupport::TestCase
  
     action_tracker = fast_create(ActionTracker::Record, :verb => 'create_article')
     action_tracker.target = community
+    action_tracker.user = p4
     action_tracker.save!
     ActionTrackerNotification.delete_all
-    assert_difference(ActionTrackerNotification, :count, 3) do
+    assert_difference(ActionTrackerNotification, :count, 4) do
       Person.notify_activity(action_tracker)
       process_delayed_job_queue
     end
     ActionTrackerNotification.all.map{|a|a.profile}.map do |profile|
-      assert [community,p1,p3].include?(profile)
+      assert [community,p1,p3,p4].include?(profile)
     end
   end
  
@@ -1011,9 +1014,9 @@ class PersonTest &lt; ActiveSupport::TestCase
  
   should 'the community specific notification created when a member joins community could not be propagated to members' do
     ActionTracker::Record.delete_all
-    p1 = create_user('test_user').person
-    p2 = create_user('test_user').person
-    p3 = create_user('test_user').person
+    p1 = create_user('p1').person
+    p2 = create_user('p2').person
+    p3 = create_user('p3').person
     c = fast_create(Community, :name => "Foo")
     c.add_member(p1)
     process_delayed_job_queue
@@ -1133,30 +1136,14 @@ class PersonTest &lt; ActiveSupport::TestCase
     p3 = fast_create(Person)
  
     ActionTracker::Record.destroy_all
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p1, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p3, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p3, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p3, :created_at => Time.now)
+    ActionTracker::Record.create!(:user => p1, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p3, :verb => 'leave_scrap')
  
-    assert_equal [p3,p2,p1] , Person.more_active
-  end
-
-  should 'more active profile take in consideration only actions created only in the recent delay interval' do
-    Person.delete_all
-    ActionTracker::Record.destroy_all
-    recent_delay = ActionTracker::Record::RECENT_DELAY.days.ago
-
-    p1 = fast_create(Person)
-    p2 = fast_create(Person)
-
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p1, :created_at => recent_delay)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p1, :created_at => recent_delay)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => recent_delay)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => recent_delay - 1.day)
-
-    assert_equal [p1,p2], Person.more_active
+    assert_order [p3,p2,p1] , Person.more_active
   end
  
   should 'list profiles that have no actions in more active list' do
@@ -1363,7 +1350,7 @@ class PersonTest &lt; ActiveSupport::TestCase
       u = create_user('user'+i.to_s)
       u.deactivate
     }
-    assert_equal activated, Person.activated
+    assert_equivalent activated, Person.activated
   end
  
   should 'deactivated named_scope return persons who are deactivated users' do
@@ -1379,7 +1366,7 @@ class PersonTest &lt; ActiveSupport::TestCase
       u = create_user('user'+i.to_s)
       u.activate
     }
-    assert_equal deactivated, Person.deactivated
+    assert_equivalent deactivated, Person.deactivated
   end
  
   should 'be able to retrieve memberships by role person has' do
@@ -1446,4 +1433,30 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert 3, original_person.memberships.count
   end
  
+  should 'increase friends_count on new friendship' do
+    person = create_user('person').person
+    friend = create_user('friend').person
+    assert_difference person, :friends_count, 1 do
+      assert_difference friend, :friends_count, 1 do
+        person.add_friend(friend)
+        friend.reload
+      end
+      person.reload
+    end
+  end
+
+  should 'decrease friends_count on friendship removal' do
+    person = create_user('person').person
+    friend = create_user('friend').person
+    person.add_friend(friend)
+    friend.reload
+    person.reload
+    assert_difference person, :friends_count, -1 do
+      assert_difference friend, :friends_count, -1 do
+        person.remove_friend(friend)
+        friend.reload
+      end
+      person.reload
+    end
+  end
 end
@@ -1688,6 +1688,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     person = fast_create(Person)
     community = fast_create(Community)
     community.add_member(person)
+    community.reload
  
     assert_equal 1, community.members_count
   end
@@ -1823,11 +1824,12 @@ class ProfileTest &lt; ActiveSupport::TestCase
     original_community.add_member(original_member)
     community1.add_member(plugin1_member)
     community2.add_member(plugin2_member)
+    original_community.reload
  
     assert_includes original_community.members, original_member
     assert_includes original_community.members, plugin1_member
     assert_includes original_community.members, plugin2_member
-    assert 3, original_community.members.count
+    assert 3, original_community.members_count
   end
  
   private
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class RoleAssignmentExtTest < ActiveSupport::TestCase
+  should 'increase organization members_count only on the first role_assignment' do
+    role1 = Role.create!(:name => 'role1')
+    role2 = Role.create!(:name => 'role2')
+    member = create_user('person').person
+    organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
+    assert_difference organization, :members_count, 1 do
+      RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
+      RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
+      organization.reload
+    end
+  end
+
+  should 'decrease organization members_count only on the last role_assignment' do
+    role1 = Role.create!(:name => 'role1')
+    role2 = Role.create!(:name => 'role2')
+    member = create_user('person').person
+    organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
+    RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
+    RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
+    organization.reload
+    assert_difference organization, :members_count, -1 do
+      organization.role_assignments.destroy_all
+      organization.reload
+    end
+  end
+end
@@ -24,7 +24,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.expects(:name).returns('my name')
  
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
  
@@ -47,7 +47,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.expects(:name).returns('my name')
  
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
  
@@ -71,7 +71,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.expects(:name).returns('my name')
  
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
  
@@ -105,7 +105,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.stubs(:public_profile_url).returns('requestor_path')
  
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
  
@@ -124,11 +124,11 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     assert !ActionMailer::Base.deliveries.empty?
   end
  
-  should 'use environment name and contact email' do
+  should 'use environment name and no-reply email' do
     task = mock
     environment = mock
     environment.expects(:name).returns('My name')
-    environment.expects(:contact_email).returns('email@example.com')
+    environment.expects(:noreply_email).returns('email@example.com')
  
     task.expects(:environment).returns(environment).at_least_once
  
@@ -191,4 +191,22 @@ class ThemeTest &lt; ActiveSupport::TestCase
     assert ! Theme.new('test').public
   end
  
+  should 'not crash with nil or invalid owner_type' do
+    profile = fast_create(Profile)
+    Theme.stubs(:system_themes_dir).returns(TMP_THEMES_DIR)
+
+    t1 = Theme.new('t1').save
+    t1.send(:write_config)
+    t2 = Theme.new('t2', {:owner_type => nil}).save
+    t2.send(:write_config)
+    t3 = Theme.new('t3', {:owner_type => 'InvalidClass'}).save
+    t3.send(:write_config)
+
+    assert_nothing_raised do
+      themes = Theme.approved_themes(profile)
+      assert_not_includes themes, t1
+      assert_not_includes themes, t2
+      assert_not_includes themes, t3
+    end
+  end
 end
@@ -31,6 +31,13 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'test.txt', file.name
   end
  
+  should 'not set filename on name if name is already set' do
+    file = UploadedFile.new
+    file.name = "Some name"
+    file.filename = 'test.txt'
+    assert_equal 'Some name', file.name
+  end
+
   should 'provide file content as data' do
     file = UploadedFile.new
     file.expects(:full_filename).returns('myfilename')
@@ -119,24 +126,13 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'my title', UploadedFile.new(:title => 'my title').title
   end
  
-  should 'limit title to 140 characters' do
-    upload = UploadedFile.new
-
-    upload.title = '+' * 61; upload.valid?
-    assert upload.errors[:title]
-
-    upload.title = '+' * 60; upload.valid?
-    assert !upload.errors[:title]
-
-  end
-
   should 'always provide a display title' do
     upload = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    assert_equal 'test.txt',  upload.display_title
+    assert_equal 'test.txt',  upload.title
     upload.title = 'My text file'
-    assert_equal 'My text file', upload.display_title
+    assert_equal 'My text file', upload.title
     upload.title = ''
-    assert_equal 'test.txt', upload.display_title
+    assert_equal 'test.txt', upload.title
   end
  
   should 'use name as title by default' do
@@ -326,13 +322,15 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
   end
  
   should 'group trackers activity of image\'s upload' do
+    ActionTracker::Record.delete_all
     gallery = fast_create(Gallery, :profile_id => profile.id)
-
+    count = ActionTracker::Record.find_all_by_verb('upload_image').count
     image1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery, :profile => profile)
-    assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
+    count += 1
+    assert_equal count, ActionTracker::Record.find_all_by_verb('upload_image').count
  
     image2 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'), :parent => gallery, :profile => profile)
-    assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
+    assert_equal count, ActionTracker::Record.find_all_by_verb('upload_image').count
   end
  
   {
 module ActionTracker
   class Record < ActiveRecord::Base
-
     set_table_name 'action_tracker'
  
     belongs_to :user, :polymorphic => true
@@ -5,8 +5,8 @@ Delayed::Worker.module_eval do
       environment = Environment.default
  
       recipients NOOSFERO_CONF['exception_recipients']
-      from       environment.contact_email
-      reply_to   environment.contact_email
+      from       environment.noreply_email
+      reply_to   environment.noreply_email
       subject    "[#{environment.name}] DelayedJob ##{job.id}: #{error.message}"
       body       render(:text => "
 Job:
...	...	@@ -0,0 +1,7 @@
	1	+module CacheCounterHelper
	2	+ def update_cache_counter(name, object, value)
	3	+ if object.present?
	4	+ object.class.update_counters(object.id, name => value)
	5	+ end
	6	+ end
	7	+end
...	...
...	...	@@ -2,7 +2,6 @@ module CommentHelper
2	2
3	3	def article_title(article, args = {})
4	4	title = article.title
5		- title = article.display_title if article.kind_of?(UploadedFile) && article.image?
6	5	title = content_tag('h1', h(title), :class => 'title')
7	6	if article.belongs_to_blog?
8	7	unless args[:no_link]
...	...
...	...	@@ -14,8 +14,7 @@ module ContentViewerHelper
14	14	end
15	15
16	16	def article_title(article, args = {})
17		- title = article.display_title if article.kind_of?(UploadedFile) && article.image?
18		- title = article.title if title.blank?
	17	+ title = article.title
19	18	title = content_tag('h1', h(title), :class => 'title')
20	19	if article.belongs_to_blog? \|\| article.belongs_to_forum?
21	20	unless args[:no_link]
...	...
...	...	@@ -172,7 +172,7 @@ class Comment < ActiveRecord::Base
172	172	def mail(comment)
173	173	profile = comment.article.profile
174	174	recipients comment.notification_emails
175		- from "#{profile.environment.name} <#{profile.environment.contact_email}>"
	175	+ from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
176	176	subject _("[%s] you got a new comment!") % [profile.environment.name]
177	177	body :recipient => profile.nickname \|\| profile.name,
178	178	:sender => comment.author_name,
...	...	@@ -187,7 +187,7 @@ class Comment < ActiveRecord::Base
187	187	def mail_to_followers(comment, emails)
188	188	profile = comment.article.profile
189	189	bcc emails
190		- from "#{profile.environment.name} <#{profile.environment.contact_email}>"
	190	+ from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
191	191	subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
192	192	body :recipient => profile.nickname \|\| profile.name,
193	193	:sender => comment.author_name,
...	...
...	...	@@ -26,7 +26,7 @@ class Contact < ActiveRecord::Base #WithoutTable
26	26	content_type 'text/html'
27	27	emails = contact.dest.notification_emails
28	28	recipients emails
29		- from "#{contact.name} <#{contact.dest.environment.contact_email}>"
	29	+ from "#{contact.name} <#{contact.dest.environment.noreply_email}>"
30	30	reply_to contact.email
31	31	if contact.sender
32	32	headers 'X-Noosfero-Sender' => contact.sender.identifier
...	...
...	...	@@ -606,7 +606,7 @@ class Environment < ActiveRecord::Base
606	606	# only one environment can be the default one
607	607	validates_uniqueness_of :is_default, :if => (lambda do \|environment\| environment.is_default? end), :message => N_('Only one Virtual Community can be the default one')
608	608
609		- validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { \|record\| ! record.contact_email.blank? })
	609	+ validates_format_of :contact_email, :noreply_email, :with => Noosfero::Constants::EMAIL_FORMAT, :allow_blank => true
610	610
611	611	xss_terminate :only => [ :message_for_disabled_enterprise ], :with => 'white_list', :on => 'validation'
612	612
...	...	@@ -793,7 +793,7 @@ class Environment < ActiveRecord::Base
793	793	end
794	794
795	795	def notification_emails
796		- [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
	796	+ [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
797	797	end
798	798
799	799	after_create :create_templates
...	...
1	1	class Friendship < ActiveRecord::Base
2	2	track_actions :new_friendship, :after_create, :keep_params => ["friend.name", "friend.url", "friend.profile_custom_icon"], :custom_user => :person
3		-
	3	+
	4	+ extend CacheCounterHelper
	5	+
4	6	belongs_to :person, :foreign_key => :person_id
5	7	belongs_to :friend, :class_name => 'Person', :foreign_key => 'friend_id'
	8	+
	9	+ after_create do \|friendship\|
	10	+ update_cache_counter(:friends_count, friendship.person, 1)
	11	+ update_cache_counter(:friends_count, friendship.friend, 1)
	12	+ end
	13	+
	14	+ after_destroy do \|friendship\|
	15	+ update_cache_counter(:friends_count, friendship.person, -1)
	16	+ update_cache_counter(:friends_count, friendship.friend, -1)
	17	+ end
6	18	end
...	...
...	...	@@ -16,15 +16,15 @@ class LayoutTemplate
16	16	end
17	17
18	18	def name
19		- @config['name']
	19	+ _ @config['name']
20	20	end
21	21
22	22	def title
23		- @config['title']
	23	+ _ @config['title']
24	24	end
25	25
26	26	def description
27		- @config['description']
	27	+ _ @config['description']
28	28	end
29	29
30	30	def number_of_boxes
...	...
...	...	@@ -17,7 +17,7 @@ class Mailing < ActiveRecord::Base
17	17	end
18	18
19	19	def generate_from
20		- "#{source.name} <#{source.contact_email}>"
	20	+ "#{source.name} <#{if source.is_a? Environment then source.noreply_email else source.contact_email end}>"
21	21	end
22	22
23	23	def generate_subject
...	...
...	...	@@ -26,18 +26,7 @@ class Organization < Profile
26	26
27	27	has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
28	28
29		- named_scope :more_popular,
30		- :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
31		- :group => Profile.qualified_column_names,
32		- :joins => "LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id",
33		- :order => "total DESC"
34		-
35		- named_scope :more_active,
36		- :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
37		- :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id",
38		- :group => Profile.qualified_column_names,
39		- :order => 'total DESC',
40		- :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
	29	+ named_scope :more_popular, :order => 'members_count DESC'
41	30
42	31	def validation_methodology
43	32	self.validation_info ? self.validation_info.validation_methodology : nil
...	...