Merge branch 'master' into AI2915-category_color

Joenio Costa
2 parents 2247304b 05d99f0e
Showing 137 changed files with 7339 additions and 5846 deletions Show diff stats
AUTHORS
Gemfile
Gemfile.lock
Rakefile
app/controllers/my_profile/cms_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/comment.rb
app/models/domain.rb
app/models/enterprise.rb
app/models/featured_products_block.rb
app/models/highlights_block.rb
app/models/location_block.rb
@@ -170,6 +170,7 @@ João M. M. Silva + Renan Teruo &lt;jaodsilv@linux.ime.usp.br&gt;
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
 Junior Silva <junior@bajor.localhost.localdomain>
+Junior Silva <junior@sedeantigo.colivre.coop.br>
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Junior Silva <juniorsilva@colivre.coop.br>
@@ -16,6 +16,7 @@ gem &#39;hpricot&#39;
 gem 'nokogiri'
 gem 'rake', :require => false
 gem 'rest-client'
+gem 'exception_notification'
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
@@ -31,7 +32,6 @@ group :test do
 end
 group :cucumber do
-  gem 'rake'
   gem 'cucumber-rails', :require => false
   gem 'capybara'
   gem 'cucumber'
@@ -61,7 +61,10 @@ GEM
     database_cleaner (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.11)
+    eventmachine (0.12.10)
+    exception_notification (4.0.1)
+      actionmailer (>= 3.0.4)
+      activesupport (>= 3.0.4)
     fast_gettext (0.6.8)
     ffi (1.0.11)
     gherkin (2.4.21)
@@ -167,6 +170,7 @@ DEPENDENCIES
   daemons
   dalli
   database_cleaner
+  exception_notification
   fast_gettext
   hpricot
   mocha
 #!/usr/bin/env rake
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
@@ -143,6 +143,7 @@ class CmsController &lt; MyProfileController
     end
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
     @article.created_by = user
@@ -195,7 +196,7 @@ class CmsController &lt; MyProfileController
               :profile => profile,
               :parent => @parent,
               :last_changed_by => user,
-              :created_by => user,
+              :author => user,
             },
             :without_protection => true
           )
@@ -2,7 +2,7 @@ class AccountController &lt; ApplicationController
   no_design_blocks
-  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
+  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise, :change_password]
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
@@ -11,7 +11,7 @@ class CatalogController &lt; PublicController
   protected
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
+    unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -74,7 +74,7 @@ class ContentViewerController &lt; ApplicationController
   end
   def versions_diff
-    path = params[:page].join('/')
+    path = params[:page]
     @page = profile.articles.find_by_path(path)
     @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
   end
@@ -216,6 +216,8 @@ class ContentViewerController &lt; ApplicationController
     if @page.has_posts?
       posts = get_posts(params[:year], params[:month])
+      posts = posts.includes(:parent, {:profile => [:domains, :environment]}, :author)
+
       #FIXME Need to run this before the pagination because this version of
       #      will_paginate returns a will_paginate collection instead of a
       #      relation.
@@ -312,13 +312,13 @@ module ApplicationHelper
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
-  def view_for_profile_actions(klass)
-    raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
-
-    name = klass.name.underscore
-    return "blocks/profile_info_actions/" + name + '.html.erb' if File.exists?(Rails.root.join('app', 'views', 'blocks', 'profile_info_actions', name + '.html.erb'))
-
-    view_for_profile_actions(klass.superclass)
+  def render_profile_actions klass
+    name = klass.to_s.underscore
+    begin
+      render "blocks/profile_info_actions/#{name}"
+    rescue ActionView::MissingTemplate
+      render_profile_actions klass.superclass
+    end
   end
   def user
@@ -1095,7 +1095,7 @@ module ApplicationHelper
     result
   end
-  def manage_link(list, kind)
+  def manage_link(list, kind, title)
     if list.present?
       link_to_all = nil
       if list.count > 5
@@ -1108,19 +1108,19 @@ module ApplicationHelper
       if link_to_all
         link << link_to_all
       end
-      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s, :title => title}
     end
   end
   def manage_enterprises
     return '' unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
-    manage_link(user.enterprises, :enterprises).to_s
+    manage_link(user.enterprises, :enterprises, _('My enterprises')).to_s
   end
   def manage_communities
     return '' unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
     administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
-    manage_link(administered_communities, :communities).to_s
+    manage_link(administered_communities, :communities, _('My communities')).to_s
   end
   def admin_link
@@ -1225,20 +1225,7 @@ module ApplicationHelper
   def add_zoom_to_images
     stylesheet_link_tag('jquery.fancybox') +
     javascript_include_tag('jquery.fancybox.pack') +
-    javascript_tag("jQuery(function($) {
-      $(window).load( function() {
-        $('#article .article-body img').each( function(index) {
-          var original = original_image_dimensions($(this).attr('src'));
-          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
-            $(this).wrap('<div class=\"zoomable-image\" />');
-            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
-            $(this).attr('style', '');
-            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
-          }
-        });
-        $('.zoomify-image').fancybox();
-      });
-    });" % _('Zoom in'))
+    javascript_tag("apply_zoom_to_images(#{_('Zoom in').to_json})")
   end
   def render_dialog_error_messages(instance_name)
@@ -1373,7 +1360,7 @@ module ApplicationHelper
       @message = _("The content here is available to %s's friends only.") % profile.short_name
     else
       @action = :join
-      @message = _('The contents in this community is available to members only.')
+      @message = _('The contents in this profile is available to members only.')
     end
     @no_design_blocks = true
   end
@@ -6,19 +6,20 @@ module BlockHelper
     content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
-  def highlights_block_config_image_fields(block, image={})
+  def highlights_block_config_image_fields(block, image={}, row_number=nil)
     "
-    <tr class=\"image-data-line\">
+    <tr class=\"image-data-line\" data-row-number='#{row_number}'>
       <td>
         #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
       </td>
       <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
       <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
-    </tr><tr class=\"image-title\">
+    </tr><tr class=\"image-title\" data-row-number='#{row_number}'>
       <td colspan=\"3\"><label>#{
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
+      <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>
     </tr>
     "
   end
@@ -45,9 +45,9 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
+    title = article_title(article, :no_comments => no_comments)
     html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
-
-    article_title(article, :no_comments => no_comments) + html
+    title + html
   end
   def display_full_format(article)
@@ -10,7 +10,7 @@ module ContentViewerHelper
   end
   def number_of_comments(article)
-    display_number_of_comments(article.comments.without_spam.count)
+    display_number_of_comments(article.comments_count - article.spam_comments_count)
   end
   def article_title(article, args = {})
@@ -26,7 +26,7 @@ module ContentViewerHelper
       end
       title << content_tag('span',
         content_tag('span', show_date(article.published_at), :class => 'date') +
-        content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +
+        content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
       )
@@ -5,15 +5,17 @@ module FolderHelper
   include ShortFilename
   include ArticleHelper
-  def list_articles(articles, recursive = false)
-    if !articles.blank?
-      articles = articles.paginate(
+  def list_contents(configure={})
+    configure[:recursive] ||= false
+    configure[:list_type] ||= :folder
+    if !configure[:contents].blank?
+      configure[:contents] = configure[:contents].paginate(
         :order => "updated_at DESC",
         :per_page => 10,
         :page => params[:npage]
       )
-      render :file => 'shared/articles_list', :locals => {:articles => articles, :recursive => recursive}
+      render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
     end
@@ -23,21 +25,33 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  def display_article_in_listing(article, recursive = false, level = 0)
-    article = FilePresenter.for article
-    article_link = if article.image?
-         link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
+  def display_content_in_listing(configure={})
+    recursive = configure[:recursive] || false
+    list_type = configure[:list_type] || :folder
+    level = configure[:level] || 0
+    content = FilePresenter.for configure[:content]
+    content_link = if content.image?
+         link_to('&nbsp;' * (level * 4) +
+           image_tag(icon_for_article(content)) + short_filename(content.name),
+           content.url.merge(:view => true)
+         )
        else
-         link_to('&nbsp;' * (level * 4) + short_filename(article.name), article.url.merge(:view => true), :class => icon_for_article(article))
+         link_to('&nbsp;' * (level * 4) +
+           short_filename(content.name),
+           content.url.merge(:view => true), :class => icon_for_article(content)
+         )
        end
     result = content_tag(
       'tr',
-      content_tag('td', article_link )+
-      content_tag('td', show_date(article.updated_at), :class => 'last-update'),
-      :class => 'sitemap-item'
+      content_tag('td', content_link ) +
+      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
+      :class => "#{list_type}-item"
     )
     if recursive
-      result + article.children.map {|item| display_article_in_listing(item, recursive, level + 1) }.join('')
+      result + content.children.map {|item|
+        display_content_in_listing :content=>item, :recursive=>recursive,
+                                   :list_type=>list_type, :level=>level+1
+      }.join("\n")
     else
       result
     end
@@ -40,6 +40,12 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
+  before_create do |article|
+    if article.author
+      article.author_name = article.author.name
+    end
+  end
+
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -48,6 +54,7 @@ class Article &lt; ActiveRecord::Base
   validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
+  belongs_to :author, :class_name => 'Person'
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
@@ -456,10 +463,10 @@ class Article &lt; ActiveRecord::Base
     ['TextArticle', 'TextileArticle', 'TinyMceArticle']
   end
-  scope :published, :conditions => { :published => true }
-  scope :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
-  scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.folder_types]}}
-  scope :galleries, :conditions => { :type => 'Gallery' }
+  scope :published, :conditions => ['articles.published = ?', true]
+  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
+  scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
+  scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
   scope :images, :conditions => { :is_image => true }
   scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
   scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
@@ -469,7 +476,7 @@ class Article &lt; ActiveRecord::Base
   scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
-    return {:conditions => ['published = ?', true]} if !user
+    return {:conditions => ['articles.published = ?', true]} if !user
     {:conditions => ["  articles.published = ? OR
                         articles.last_changed_by_id = ? OR
                         articles.profile_id = ? OR
@@ -496,6 +503,7 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_post_content?(user = nil)
+    return true if allow_edit_topic?(user)
     user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == author))
   end
@@ -515,9 +523,14 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_edit?(user)
+    return true if allow_edit_topic?(user)
     allow_post_content?(user) || user && allow_members_to_edit && user.is_member_of?(profile)
   end
+  def allow_edit_topic?(user)
+    self.belongs_to_forum? && (user == author) && user.present? && user.is_member_of?(profile)
+  end
+
   def moderate_comments?
     moderate_comments == true
   end
@@ -632,35 +645,36 @@ class Article &lt; ActiveRecord::Base
     can_display_versions? && display_versions
   end
-  def author(version_number = nil)
-    if version_number
-      version = self.versions.find_by_version(version_number)
-      author_id = version.last_changed_by_id if version
-    else
-      author_id = self.created_by_id
-    end
+  def get_version(version_number = nil)
+    version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest
+  end
-    environment.people.find_by_id(author_id)
+  def author_by_version(version_number = nil)
+    version_number ? profile.environment.people.find_by_id(get_version(version_number).author_id) : author
   end
   def author_name(version_number = nil)
-    person = author(version_number)
-    person ? person.name : (setting[:author_name] || _('Unknown'))
+    person = author_by_version(version_number)
+    if version_number
+      person ? person.name : _('Unknown')
+    else
+      person ? person.name : (setting[:author_name] || _('Unknown'))
+    end
   end
   def author_url(version_number = nil)
-    person = author(version_number)
+    person = author_by_version(version_number)
     person ? person.url : nil
   end
   def author_id(version_number = nil)
-    person = author(version_number)
+    person = author_by_version(version_number)
     person ? person.id : nil
   end
   def version_license(version_number = nil)
     return license if version_number.nil?
-    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
+    profile.environment.licenses.find_by_id(get_version(version_number).license_id)
   end
   alias :active_record_cache_key :cache_key
@@ -109,14 +109,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
   include Spammable
+  include CacheCounterHelper
   def after_spam!
     SpammerLogger.log(ip_address, self)
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+    update_cache_counter(:spam_comments_count, source, 1) if source.kind_of?(Article)
   end
   def after_ham!
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+    update_cache_counter(:spam_comments_count, source, -1) if source.kind_of?(Article)
   end
   def verify_and_notify
@@ -2,7 +2,7 @@ require &#39;noosfero/multi_tenancy&#39;
 class Domain < ActiveRecord::Base
-  attr_accessible :name, :owner
+  attr_accessible :name, :owner, :is_default
   # relationships
   ###############
@@ -25,7 +25,10 @@ class Enterprise &lt; Organization
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
   settings_items :organization_website, :historic_and_current_context, :activities_short_description
+
   settings_items :products_per_catalog_page, :type => :integer, :default => 6
+  alias_method :products_per_catalog_page_before_type_cast, :products_per_catalog_page
+  validates_numericality_of :products_per_catalog_page, :allow_nil => true, :greater_than => 0
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
 class FeaturedProductsBlock < Block
+  attr_accessible :product_ids, :groups_of, :speed, :reflect
+
   settings_items :product_ids, :type => Array, :default => []
   settings_items :groups_of, :type => :integer, :default => 3
   settings_items :speed, :type => :integer, :default => 1000
 class HighlightsBlock < Block
-  attr_accessible :images
+  attr_accessible :images, :interval, :shuffle, :navigation
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
 class LocationBlock < Block
+  attr_accessible :zoom, :map_type
+
   settings_items :zoom, :type => :integer, :default => 4
   settings_items :map_type, :type => :string, :default => 'roadmap'
@@ -33,7 +33,7 @@ class ProductCategoriesBlock &lt; Block
     end
   end
-  DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')
+  DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
   def display
     settings[:display].nil? ? 'catalog_only' : super
@@ -49,17 +49,10 @@ class ProductsBlock &lt; Block
   def products(reload = false)
     if product_ids.blank?
-      products_list = owner.products(reload)
-      result = []
-      [4, products_list.size].min.times do
-        p = products_list.sample
-        result << p
-        products_list -= [p]
-      end
-      result
+      owner.products.order('RANDOM()').limit([4,owner.products.count].min)
     else
-      product_ids.map {|item| owner.products.find(item) }
-    end
+      owner.products.where(:id => product_ids)
+    end.compact
   end
 end
 class RssFeed < Article
-  attr_accessible :limit, :enabled, :language, :include
+  attr_accessible :limit, :enabled, :language, :include, :feed_item_description
   def self.type_name
     _('RssFeed')
@@ -5,7 +5,7 @@ require &#39;user_activation_job&#39;
 # Rails generator.
 class User < ActiveRecord::Base
-  attr_accessible :login, :email, :password, :password_confirmation
+  attr_accessible :login, :email, :password, :password_confirmation, :activated_at
   N_('Password')
   N_('Password confirmation')
@@ -11,4 +11,9 @@ class FilePresenter::Image &lt; FilePresenter
   def short_description
     _('Image (%s)') % content_type.split('/')[1].upcase
   end
+
+  #Overwriting method from FilePresenter to allow download of images
+  def download?(view = nil)
+    view.blank? || view == 'false'
+  end
 end
@@ -136,8 +136,6 @@
 <script type="text/javascript">
 jQuery(function($) {
-  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
-
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
     $(this).bind('blur', function() {
       if ($(this).val() == '') {
 <%= block_title(title) %>
-<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
+<%= render_profile_actions owner.class %>
 <ul>
   <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
@@ -11,5 +11,5 @@
 </ul>
 <div class="my-network-actions">
-  <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
+  <%= render 'blocks/profile_info_actions/' + owner.class.name.underscore %>
 </div>
@@ -23,6 +23,6 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(block.owner.class) %>
+  <%= render_profile_actions block.owner.class %>
 </div>
 </div><!-- end class="vcard" -->
@@ -40,7 +40,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(block.owner.class) %>
+  <%= render_profile_actions block.owner.class %>
 </div>
 </div><!-- end class="vcard" -->
@@ -0,0 +1,20 @@
+<ul>
+  <li>
+    <%= render "blocks/profile_info_actions/join_leave_community" %>
+  </li>
+  <% if logged_in? %>
+    <% if profile.enable_contact? %>
+      <li>
+      <%= link_to content_tag('span', _('Send an e-mail')),
+        { :profile => profile.identifier,
+          :controller => 'contact',
+          :action => 'new' },
+        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
+      </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+
+    <%= render_environment_features(:profile_actions) %>
+  <% end %>
+</ul>
@@ -0,0 +1,12 @@
+<ul>
+  <%if logged_in? %>
+    <%if !user.favorite_enterprises.include?(profile) %>
+      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
+    <% end %>
+  <% end %>
+  <% if profile.enable_contact? %>
+    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
+  <% end %>
+
+  <li><%= report_abuse(profile, :button) %></li>
+</ul>
@@ -0,0 +1,16 @@
+<ul>
+  <%if logged_in? && (user != profile) %>
+
+    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
+      <li>
+      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      </li>
+    <% end %>
+
+    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
+      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+  <% end %>
+</ul>
@@ -1,20 +0,0 @@
-<ul>
-  <li>
-    <%= render "blocks/profile_info_actions/join_leave_community" %>
-  </li>
-  <% if logged_in? %>
-    <% if profile.enable_contact? %>
-      <li>
-      <%= link_to content_tag('span', _('Send an e-mail')),
-        { :profile => profile.identifier,
-          :controller => 'contact',
-          :action => 'new' },
-        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
-      </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-
-    <%= render_environment_features(:profile_actions) %>
-  <% end %>
-</ul>
@@ -1,12 +0,0 @@
-<ul>
-  <%if logged_in? %>
-    <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
-    <% end %>
-  <% end %>
-  <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
-  <% end %>
-
-  <li><%= report_abuse(profile, :button) %></li>
-</ul>
@@ -1,16 +0,0 @@
-<ul>
-  <%if logged_in? && (user != profile) %>
-
-    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
-      <li>
-      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
-      </li>
-    <% end %>
-
-    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
-      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-  <% end %>
-</ul>
+<%= javascript_include_tag "highlight_block" %>
+
 <strong><%= _('Highlights') %></strong>
 <table class="noborder"><tbody id="highlights-data-table">
   <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
-  <% for image in @block.images do %>
-    <%= highlights_block_config_image_fields @block, image %>
+  <% @block.images.each_with_index do |image, index| %>
+    <%= highlights_block_config_image_fields @block, image, index %>
   <% end %>
 </tbody></table>
-<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
-  page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
-end %>
+<table class="hidden highlight-table-row">
+  <tbody>
+    <%= highlights_block_config_image_fields(@block) %>
+  </tbody>
+</table>
+
+<%= link_to(_('New highlight'), '#', :class => 'button icon-add with-text new-highlight-button')%>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
@@ -31,7 +31,7 @@ function check_captcha(button, confirm_action) {
   return true;
   <% else %>
   jQuery('#recaptcha-container').show();
-  jQuery.colorbox({ inline : true, href : '#recaptcha-container', maxWidth : '600px', maxHeight : '300px' });
+  jQuery.colorbox({ html: jQuery('#recaptcha-container').html(), maxWidth : '600px', maxHeight : '300px' });
   jQuery('#confirm-captcha').unbind('click');
   jQuery('#confirm-captcha').bind('click', function() {
     jQuery.colorbox.close();
 <div class="article-versions">
-  <%= button(:back, _('Go back to latest version'), {:action => 'view_page'}) %>
+  <%= button(:back, _('Go back to latest version'), @page.url) %>
 </div>
 <%= article_title(@page, :no_link => true) %>
 <p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
-<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}, :method => 'get') do %>
+<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path}, :method => 'get') do %>
   <ul id="article-versions">
     <% @versions.each do |v| %>
       <li>
@@ -8,5 +8,5 @@
 <% if folder.children.empty? %>
   <em><%= _('(empty folder)') %></em>
 <% else %>
-  <%= list_articles(folder.children) %>
+  <%= list_contents(:contents=>folder.children) %>
 <% end %>
@@ -23,7 +23,6 @@
   <p id="no-current-version">
     <%= _('This is not the latest version of this content.') %>
   </p>
-</div>
   <% version_license = @page.version_license(@version) %>
   <%# This seemingly doubled verification exists because the article-sub-header
@@ -40,8 +40,6 @@
   </div>
 <% end %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <h1><%= h profile.name %></h1>
 <% if @action %>
 <h1><%= _("%s: site map") % profile.name %></h1>
-<%= list_articles(available_articles(@articles, user), false) %>
+<%= list_contents :contents=>available_articles(@articles, user), :list_type=>:sitemap %>
@@ -24,7 +24,7 @@
   <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
-  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
+  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') if user.is_admin?(environment) || (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))  %>
   <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
@@ -1,10 +0,0 @@
-<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
-  <div id='profile-disabled'>
-    <%= environment.message_for_disabled_enterprise %>
-    <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
-      <div class='unlock-button'>
-        <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
 <div id=<%= "manage-#{kind}" %> class="manage-groups">
-  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % _(kind) %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + title %></strong></a>
   <ul class="simplemenu-submenu">
     <% link.each do |link| %>
       <li class="simplemenu-item"><%= link %></li>
@@ -1,14 +0,0 @@
-<table>
-
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
-  <% articles.each do |article| %>
-    <% if article.display_to?(user) %>
-      <%= display_article_in_listing(article, recursive, 0) %>
-    <% end %>
-  <% end %>
-</table>
-
-<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
@@ -0,0 +1,13 @@
+<table class="<%= list_type %>-content">
+  <tr>
+    <th><%= _('Title') %></th>
+    <th><%= _('Last update') %></th>
+  </tr>
+  <% contents.each do |content| %>
+    <% if content.display_to?(user) %>
+      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
+    <% end %>
+  <% end %>
+</table>
+
+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
 # Load the rails application
 require File.expand_path('../application', __FILE__)
+#FIXME Necessary hack to avoid the need of downgrading rubygems on rails 2.3.5
+# http://stackoverflow.com/questions/5564251/uninitialized-constant-activesupportdependenciesmutex
+require 'thread'
+
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 #ENV['RAILS_ENV'] ||= 'production'
 unless NOOSFERO_CONF['exception_recipients'].blank?
-  require 'noosfero.rb'
-  require 'exception_notification.rb'
-  ExceptionNotifier.sender_address = "noreply@#{Noosfero.default_hostname}"
-  ExceptionNotifier.email_prefix = "[Noosfero ERROR] "
-  ExceptionNotifier.exception_recipients = NOOSFERO_CONF['exception_recipients']
-  ActionController::Base.send :include, ExceptionNotifiable
+  Noosfero::Application.config.middleware.use ExceptionNotification::Rack,
+    :email => {
+      :sender_address => "noreply@#{Noosfero.default_hostname}",
+      :email_prefix => "[Noosfero ERROR] ",
+      :exception_recipients => NOOSFERO_CONF['exception_recipients']
+    }
 end
@@ -131,7 +131,7 @@ Noosfero::Application.routes.draw do
   match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # match requests for profiles that don't have a custom domain
@@ -0,0 +1,17 @@
+class IndexFilteredFieldsOnTask < ActiveRecord::Migration
+  def self.up
+    add_index :tasks, :requestor_id
+    add_index :tasks, :target_id
+    add_index :tasks, :target_type
+    add_index :tasks, [:target_id, :target_type]
+    add_index :tasks, :status
+  end
+
+  def self.down
+    remove_index :tasks, :requestor_id
+    remove_index :tasks, :target_id
+    remove_index :tasks, :target_type
+    remove_index :tasks, [:target_id, :target_type]
+    remove_index :tasks, :status
+  end
+end
@@ -0,0 +1,12 @@
+class AddSpamCommentsCounterCacheToArticles < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :spam_comments_count, :integer, :default => 0
+    add_column :article_versions, :spam_comments_count, :integer, :default => 0
+    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+  end
+
+  def self.down
+    remove_column :articles, :spam_comments_count
+    remove_column :article_versions, :spam_comments_count
+  end
+end
@@ -0,0 +1,14 @@
+class CreateRealRelationBetweenArticleAndAuthor < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :author_id, :integer
+    add_column :article_versions, :author_id, :integer
+
+    # Set article's author as the first version's last_changed_by_id.
+    execute "update articles set author_id = (select article_versions.last_changed_by_id from article_versions where article_versions.article_id = articles.id and article_versions.version = 1 limit 1)"
+  end
+
+  def self.down
+    remove_column :articles, :author_id
+    remove_column :article_versions, :author_id
+  end
+end
@@ -0,0 +1,11 @@
+class UpdateDefaultTaggingContext < ActiveRecord::Migration
+
+  def self.up
+    ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => nil).update_all(:context => 'tags')
+  end
+
+  def self.down
+    ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => 'tags').update_all(:context => nil)
+  end
+
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140724134601) do
+ActiveRecord::Schema.define(:version => 20140808185510) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -96,6 +96,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
     t.integer  "image_id"
     t.integer  "position"
     t.integer  "created_by_id"
+    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "author_id"
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -142,6 +144,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
     t.integer  "image_id"
     t.integer  "position"
     t.integer  "created_by_id"
+    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "author_id"
   end
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -597,7 +601,12 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
     t.boolean  "spam",                       :default => false
   end
+  add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
   add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+  add_index "tasks", ["status"], :name => "index_tasks_on_status"
+  add_index "tasks", ["target_id", "target_type"], :name => "index_tasks_on_target_id_and_target_type"
+  add_index "tasks", ["target_id"], :name => "index_tasks_on_target_id"
+  add_index "tasks", ["target_type"], :name => "index_tasks_on_target_type"
   create_table "terms_forum_people", :id => false, :force => true do |t|
     t.integer "forum_id"
@@ -4,6 +4,18 @@ noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
+noosfero (0.47.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 20 Jun 2014 03:13:29 +0000
+
+noosfero (0.47.2) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 13 Jun 2014 15:19:28 +0000
+
 noosfero (0.47.1) unstable; urgency=low
   * Bugfix release
@@ -32,10 +32,10 @@ Package: noosfero
 Architecture: all
 Depends:
  rails3 (>= 3.2.6-1~),
- ruby,
- ruby1.9.3,
+ ruby (>= 1:1.9.3),
  rake,
  ruby-dalli,
+ ruby-exception-notification,
  ruby-fast-gettext,
  ruby-pg,
  ruby-rmagick,
@@ -0,0 +1,44 @@
+Feature: Edit Highlight Block
+  As a user
+  I want to edit the highlight block
+
+  Background:
+    Given I am on the homepage
+    And the following users
+      | login       | name         |
+      | jose        | Jose Silva   |
+    And I am logged in as "jose"
+
+  @selenium
+  Scenario: Add new highlight
+    Given I follow "Control panel"
+    And I follow "Edit sideboxes"
+    And I follow "Add a block"
+    And I choose "Highlights"
+    And I press "Add"
+    And I follow "Edit" within ".highlights-block"#Need to hover the mouse on the box
+    And I follow "New highlight"
+    And I fill in "block_images__address" with "/"
+    And I fill in "block_images__position" with "0"
+    And I fill in "block_images__title" with "test highlights"
+    And I press "Save"
+    And I follow "Edit" within ".highlights-block"
+    Then I should see "Title"
+
+  @selenium-fixme
+  Scenario: Remove one saved highlight
+    Given I follow "Control panel"
+    And I follow "Edit sideboxes"
+    And I follow "Add a block"
+    And I choose "Highlights"
+    And I press "Add"
+    And I follow "Edit" within ".highlights-block"
+    And I follow "New highlight"
+    And I fill in "block_images__address" with "/"
+    And I fill in "block_images__position" with "0"
+    And I fill in "block_images__title" with "test highlights"#Need to hover the mouse on the box
+    And I press "Save"
+    And I follow "Edit" within ".highlights-block"
+    And I follow "" within ".delete-highlight"
+    And I confirm the browser dialog
+    Then I should not see "Title"
 \ No newline at end of file
@@ -6,7 +6,9 @@ class FilePresenter
   # one accepts it. That behave allow to give any model to this class,
   # like a Article and have no trouble with that.
   def self.for(f)
-    return f if f.is_a? FilePresenter
+    #FIXME This check after the || is redundant but increases the blog_page
+    #      speed considerably.
+    return f if f.is_a?(FilePresenter ) || (!f.kind_of?(UploadedFile) && !f.kind_of?(Image))
     klass = FilePresenter.subclasses.sort_by {|class_instance|
       class_instance.accepts?(f) || 0
     }.last
-plugins_root = Rails.env.test? ? 'plugins' : File.join('config', 'plugins')
+plugins_root = Rails.env.test? ? 'plugins' : '{baseplugins,config/plugins}'
 Dir.glob(Rails.root.join(plugins_root, '*', 'controllers')) do |controllers_dir|
   prefixes_by_folder = {'public' => 'plugin',
@@ -137,7 +137,6 @@ namespace :noosfero do
     desc "Translates Noosfero online documentation (does not touch PO files)"
     task :translate => [:link_plugins_textiles, :do_translation]
     task :do_translation => english_xhtml do
-      require_dependency 'noosfero'
       languages = Noosfero.locales.keys - ['en']
       languages.each do |lang|
         po = "po/#{lang}/noosfero-doc.po"
@@ -5,7 +5,7 @@ namespace :noosfero do
     task :update => ['updatepo', 'noosfero:doc:rebuild']
     desc 'Compiles all translations'
-    task :compile => ['makemo', 'noosfero:doc:translate']
+    task :compile => ['makemo', 'environment', 'noosfero:doc:translate']
   end
 end
@@ -65,10 +65,8 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
   def submissions
     @form = CustomFormsPlugin::Form.find(params[:id])
-    @submissions = @form.submissions
-
-    @sort_by = params[:sort_by]
-    @submissions = @submissions.sort_by { |s| s.profile.present? ? s.profile.name : s.author_name } if @sort_by == 'author'
+    @sort_by = params[:sort_by] == 'author_name' ? 'author_name' : 'created_at'
+    @submissions = @form.submissions.order(@sort_by)
     respond_to do |format|
       format.html
@@ -6,40 +6,26 @@ class CustomFormsPluginProfileController &lt; ProfileController
     @form = CustomFormsPlugin::Form.find(params[:id])
     if user
-      @submission ||= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
+      @submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
       @submission ||= CustomFormsPlugin::Submission.new(:form => @form, :profile => user)
     else
-      @submission ||= CustomFormsPlugin::Submission.new(:form => @form)
+      @submission = CustomFormsPlugin::Submission.new(:form => @for)
     end
     # build the answers
-    @submission.answers.push(*(answers = build_answers(params[:submission], @form))) if params[:submission]
+    @answers = if params[:submission] then @submission.build_answers params[:submission] else @submission.answers end
     if request.post?
       begin
         raise 'Submission already present!' if user.present? && CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
         raise 'Form expired!' if @form.expired?
-        # @submission.answers for some reason has the same answer twice
-        failed_answers = answers.select {|answer| !answer.valid? }
-
-        if failed_answers.empty?
-          # Save the submission
-          ActiveRecord::Base.transaction do
-            if !user
-              @submission.author_name = params[:author_name]
-              @submission.author_email = params[:author_email]
-            end
-            @submission.save!
-          end
-        else
-          @submission.errors.clear
-          failed_answers.each do |answer|
-            answer.valid?
-            answer.errors.each do |attribute, msg|
-              @submission.errors.add(answer.field.id.to_s.to_sym, msg)
-            end
-          end
+        if !user
+          @submission.author_name = params[:author_name]
+          @submission.author_email = params[:author_email]
+        end
+
+        if not @submission.save
           raise 'Submission failed: answers not valid'
         end
         session[:notice] = _('Submission saved')
@@ -4,10 +4,7 @@ class AddAdmissionToForm &lt; ActiveRecord::Migration
       t.boolean :for_admission, :default => false
     end 
-    CustomFormsPlugin::Form.find_each do |f|
-      f.for_admission = false
-      f.save!
-    end
+    execute('update custom_forms_plugin_forms set for_admission = (1<0)')
   end
   def self.down
@@ -0,0 +1,11 @@
+class RemoveFormsWithoutProfile < ActiveRecord::Migration
+  def self.up
+    CustomFormsPlugin::Form.find_each do |form|
+      form.destroy if form.profile.nil?
+    end
+  end
+
+  def self.down
+    say "This migration is irreversible."
+  end
+end
@@ -0,0 +1,19 @@
+class FillInAuthorNameOnSubmission < ActiveRecord::Migration
+  def up
+    CustomFormsPlugin::Submission.find_each do |submission|
+      unless submission.profile.nil?
+        submission.author_name = submission.profile.name
+        submission.save
+      end
+    end
+  end
+
+  def down
+    CustomFormsPlugin::Submission.find_each do |submission|
+      unless submission.profile.nil?
+        submission.author_name = nil
+        submission.save
+      end
+    end
+  end
+end
@@ -5,6 +5,6 @@ class CustomFormsPlugin::Alternative &lt; ActiveRecord::Base
   belongs_to :field, :class_name => 'CustomFormsPlugin::Field'
-  attr_accessible :label, :field, :position
+  attr_accessible :label, :field, :position, :selected_by_default
 end
@@ -21,7 +21,7 @@ class CustomFormsPlugin::Form &lt; Noosfero::Plugin::ActiveRecord
   end
   after_destroy do |form|
-    tasks = CustomFormsPlugin::MembershipSurvey.from(form.profile).opened.select { |t| t.form_id == form.id }
+    tasks = CustomFormsPlugin::MembershipSurvey.opened.select { |t| t.form_id == form.id }
     tasks.each {|task| task.cancel}
   end
 module CustomFormsPlugin::Helper
+
+  protected
+
   def html_for_field(builder, association, klass)
     new_object = klass.new
     builder.fields_for(association, new_object, :child_index => "new_#{association}") do |f|
@@ -117,22 +120,4 @@ module CustomFormsPlugin::Helper
     type_for_options(field.class) == 'select_field' && field.select_field_type == 'check_box'
   end
-  def build_answers(submission, form)
-    answers = []
-    form.fields.each do |field|
-      final_value = ''
-      if submission.has_key?(field.id.to_s)
-        value = submission[field.id.to_s]
-        if value.kind_of?(String)
-          final_value = value
-        elsif value.kind_of?(Array)
-          final_value = value.join(',')
-        elsif value.kind_of?(Hash)
-          final_value = value.map {|option, present| present == '1' ? option : nil}.compact.join(',')
-        end
-      end
-      answers << CustomFormsPlugin::Answer.new(:field => field, :value => final_value)
-    end
-    answers
-  end
 end
@@ -11,23 +11,9 @@ class CustomFormsPlugin::MembershipSurvey &lt; Task
     form = CustomFormsPlugin::Form.find(form_id)
     raise 'Form expired' if form.expired?
-    answers = build_answers(submission, form)
     s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)
-    s.answers.push(*answers)
-
-    failed_answers = answers.select {|answer| !answer.valid? }
-    if failed_answers.empty?
-      s.save!
-    else
-      s.errors.clear
-      answers.each do |answer|
-        answer.valid?
-        answer.errors.each do |attribute, msg|
-          s.errors.add(answer.field.id.to_s.to_sym, msg)
-        end
-      end
-      raise ActiveRecord::RecordInvalid, s
-    end
+    s.build_answers submission
+    s.save!
   end
   def title
@@ -2,7 +2,8 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
   belongs_to :profile
-  has_many :answers, :class_name => 'CustomFormsPlugin::Answer', :dependent => :destroy
+  # validation is done manually, see below
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer', :dependent => :destroy, :validate => false
   attr_accessible :form, :profile
@@ -10,6 +11,7 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   validates_presence_of :author_name, :author_email, :if => lambda {|submission| submission.profile.nil?}
   validates_uniqueness_of :author_email, :scope => :form_id, :allow_nil => true
   validates_format_of :author_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|submission| !submission.author_email.blank?})
+  validate :check_answers
   def self.human_attribute_name(attrib)
     if /\d+/ =~ attrib and (f = CustomFormsPlugin::Field.find_by_id(attrib.to_i))
@@ -19,5 +21,40 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
     end
   end
-end
+  before_create do |submission|
+    if submission.profile
+      submission.author_name = profile.name
+    end
+  end
+
+  def build_answers submission
+    self.form.fields.each do |field|
+      next unless value = submission[field.id.to_s]
+
+      final_value = ''
+      if value.kind_of?(String)
+        final_value = value
+      elsif value.kind_of?(Array)
+        final_value = value.join(',')
+      elsif value.kind_of?(Hash)
+        final_value = value.map {|option, present| present == '1' ? option : nil}.compact.join(',')
+      end
+
+      self.answers.build :field => field, :value => final_value
+    end
+    self.answers
+  end
+
+  protected
+
+  def check_answers
+    self.answers.each do |answer|
+      answer.valid?
+      answer.errors.each do |attribute, msg|
+        self.errors.add answer.field.id.to_s.to_sym, msg
+      end
+    end
+  end
+
+end
@@ -0,0 +1,7 @@
+require_dependency 'profile'
+
+class Profile
+
+  has_many :forms, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy
+
+end
@@ -0,0 +1,5 @@
+jQuery("select.filter").change(function(){
+  var filter = jQuery(this).find("option:selected").val();
+  var attribute = jQuery(this).attr('name');
+  redirect_to('?' + attribute + '=' + filter);
+});
@@ -220,7 +220,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_not_nil assigns(:sort_by)
     assert_select 'table.action-table', /Author\W*Time\W*john[\W\dh]*bob[\W\dh]*/
-    get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'author'
+    get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'author_name'
     assert_not_nil assigns(:sort_by)
     assert_select 'table.action-table', /Author\W*Time\W*bob[\W\dh]*john[\W\dh]*/
   end
@@ -274,4 +274,15 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
       s2.reload
     end
   end
+
+  should 'destroy forms after profile is destroyed' do
+    profile = fast_create(Profile)
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    profile.destroy
+
+    assert_raise ActiveRecord::RecordNotFound do
+      CustomFormsPlugin::Form.find(form.id)
+    end
+  end
+
 end
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 class CustomFormsPlugin::SubmissionTest < ActiveSupport::TestCase
+  def setup
+    @profile = fast_create(Profile)
+  end
+  attr_reader :profile
+
   should 'validates presence of form' do
     submission = CustomFormsPlugin::Submission.new
     submission.valid?
     assert submission.errors.include?(:form)
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     submission.form = form
     submission.valid?
     assert !submission.errors.include?(:form)
   end
   should 'belong to a profile' do
-    profile = fast_create(Profile)
     submission = CustomFormsPlugin::Submission.new
     submission.profile = profile
     assert_equal profile, submission.profile
@@ -33,14 +37,21 @@ class CustomFormsPlugin::SubmissionTest &lt; ActiveSupport::TestCase
   end
   should 'have answers' do
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
-    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
-    a1 = CustomFormsPlugin::Answer.create!(:field => field, :submission => submission)
-    a2 = CustomFormsPlugin::Answer.create!(:field => field, :submission => submission)
+    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => profile)
+    a1 = submission.answers.create!(:field => field, :submission => submission)
+    a2 = submission.answers.create!(:field => field, :submission => submission)
     assert_includes submission.answers, a1
     assert_includes submission.answers, a2
   end
+
+  should 'store profile name as author' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
+    submission = CustomFormsPlugin::Submission.create(:form => form, :profile => profile)
+
+    assert_equal profile.name, submission.author_name
+  end
 end
@@ -12,7 +12,7 @@
   <%= f.hidden_field(:position) %>
   <%= f.hidden_field :_destroy, :class => 'destroy-field' %>
-  <%= button_to_function :delete, _('Remove field'), "customFormsPlugin.removeFieldBox(this, #{j _('Are you sure you want to remove this field?').to_json})" %>
+  <%= button_to_function :delete, _('Remove field'), "customFormsPlugin.removeFieldBox(this, #{CGI::escapeHTML(_('Are you sure you want to remove this field?').to_json)})" %>
   <%= yield %>
 </div>
 </fieldset>
@@ -31,8 +31,8 @@
 </ul>
 <div class="addition-buttons">
-  <%= button(:add, _('Add a new text field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{j html_for_field(f, :fields, CustomFormsPlugin::TextField).to_json}); return false")%>
-  <%= button(:add, _('Add a new select field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{j html_for_field(f, :fields, CustomFormsPlugin::SelectField).to_json}); return false")%>
+  <%= button(:add, _('Add a new text field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{CGI::escapeHTML(html_for_field(f, :fields, CustomFormsPlugin::TextField).to_json)}); return false")%>
+  <%= button(:add, _('Add a new select field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{CGI::escapeHTML(html_for_field(f, :fields, CustomFormsPlugin::SelectField).to_json)}); return false")%>
 </div>
 <% button_bar do %>
@@ -7,6 +7,6 @@
   <td>
     <%= f.hidden_field :_destroy, :class => 'destroy-field' %>
-    <%= button_to_function_without_text :remove, _('Remove alternative'), "customFormsPlugin.removeAlternative(this, #{j _('Are you sure you want to remove this alternative?').to_json})", :class => 'remove-field', :title => _('Remove alternative') %>
+    <%= button_to_function_without_text :remove, _('Remove alternative'), "customFormsPlugin.removeAlternative(this, #{CGI::escapeHTML(_('Are you sure you want to remove this alternative?').to_json)})", :class => 'remove-field', :title => _('Remove alternative') %>
   </td>
 </tr>
@@ -22,7 +22,7 @@
     <tfoot>
     <tr class="addition-buttons">
       <td colspan="3">
-      <%= button(:add, _('Add a new alternative'), '#', :onclick => "customFormsPlugin.addFields(this, 'alternatives', #{j html_for_field(f, :alternatives, CustomFormsPlugin::Alternative).to_json}); return false") %>
+      <%= button(:add, _('Add a new alternative'), '#', :onclick => "customFormsPlugin.addFields(this, 'alternatives', #{CGI::escapeHTML(html_for_field(f, :alternatives, CustomFormsPlugin::Alternative).to_json)}); return false") %>
       </td>
     </tr>
     </tfoot>
 <h1><%= @form.name %></h1>
 <p><%= @form.description %></p>
-<% fields_for :submission, @submission do |f| %>
+<%= fields_for :submission, @submission do |f| %>
   <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
 <% end %>
@@ -10,7 +10,7 @@
     <%= link_to '[CSV]', :format => 'csv' %>
   </p>
   <p>
-    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['time', _('Time')], ['author', _('Author')]], :onchange => 'document.location.href = "?sort_by="+this.value') %>
+    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['created_at', _('Time')], ['author_name', _('Author')]], :class => 'filter') %>
   </p>
   <table class="action-table">
     <tr>
@@ -30,3 +30,5 @@
 <% button_bar do %>
   <%= button :back, _('Back to forms'), :action => 'index' %>
 <% end %>
+
+<%= javascript_include_tag '../plugins/custom_forms/order' %>
@@ -28,8 +28,8 @@ class ShoppingCartPluginController &lt; PublicController
   def add
     product = find_product(params[:id])
-    if product && enterprise = validate_same_enterprise(product)
-      self.cart = { :profile_id => enterprise.id, :items => {} } if self.cart.nil?
+    if product && profile = validate_same_profile(product)
+      self.cart = { :profile_id => profile.id, :items => {} } if self.cart.nil?
       self.cart[:items][product.id] = 0 if self.cart[:items][product.id].nil?
       self.cart[:items][product.id] += 1
       render :text => {
@@ -38,7 +38,7 @@ class ShoppingCartPluginController &lt; PublicController
         :products => [{
           :id => product.id,
           :name => product.name,
-          :price => get_price(product, enterprise.environment),
+          :price => get_price(product, profile.environment),
           :description => product.description,
           :picture => product.default_image(:minor),
           :quantity => self.cart[:items][product.id]
@@ -97,8 +97,8 @@ class ShoppingCartPluginController &lt; PublicController
     @customer = user || Person.new
     if validate_cart_presence
       @cart = cart
-      @enterprise = environment.enterprises.find(cart[:profile_id])
-      @settings = Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
+      @profile = environment.profiles.find(cart[:profile_id])
+      @settings = Noosfero::Plugin::Settings.new(@profile, ShoppingCartPlugin)
       render :layout => false
     end
   end
@@ -106,9 +106,9 @@ class ShoppingCartPluginController &lt; PublicController
   def send_request
     register_order(params[:customer], self.cart[:items])
     begin
-      enterprise = environment.enterprises.find(cart[:profile_id])
-      ShoppingCartPlugin::Mailer.customer_notification(params[:customer], enterprise, self.cart[:items], params[:delivery_option]).deliver
-      ShoppingCartPlugin::Mailer.supplier_notification(params[:customer], enterprise, self.cart[:items], params[:delivery_option]).deliver
+      profile = environment.profiles.find(cart[:profile_id])
+      ShoppingCartPlugin::Mailer.customer_notification(params[:customer], profile, self.cart[:items], params[:delivery_option]).deliver
+      ShoppingCartPlugin::Mailer.supplier_notification(params[:customer], profile, self.cart[:items], params[:delivery_option]).deliver
       self.cart = nil
       render :text => {
         :ok => true,
@@ -169,8 +169,8 @@ class ShoppingCartPluginController &lt; PublicController
   end
   def update_delivery_option
-    enterprise = environment.enterprises.find(cart[:profile_id])
-    settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    profile = environment.profiles.find(cart[:profile_id])
+    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
     delivery_price = settings.delivery_options[params[:delivery_option]]
     delivery = Product.new(:name => params[:delivery_option], :price => delivery_price)
     delivery.save(false)
@@ -189,7 +189,7 @@ class ShoppingCartPluginController &lt; PublicController
   private
-  def validate_same_enterprise(product)
+  def validate_same_profile(product)
     if self.cart && self.cart[:profile_id] && product.profile_id != self.cart[:profile_id]
       render :text => {
         :ok => false,
@@ -200,7 +200,7 @@ class ShoppingCartPluginController &lt; PublicController
       }.to_json
       return nil
     end
-    product.enterprise
+    product.profile
   end
   def validate_cart_presence
@@ -269,7 +269,7 @@ class ShoppingCartPluginController &lt; PublicController
       new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
     end
     purchase_order = ShoppingCartPlugin::PurchaseOrder.new
-    purchase_order.seller = Enterprise.find(cart[:profile_id])
+    purchase_order.seller = environment.profiles.find(cart[:profile_id])
     purchase_order.customer = user
     purchase_order.status = ShoppingCartPlugin::PurchaseOrder::Status::OPENED
     purchase_order.products_list = new_items
@@ -326,7 +326,7 @@ class ShoppingCartPluginController &lt; PublicController
       if product
         { :id => product.id,
           :name => product.name,
-          :price => get_price(product, product.enterprise.environment),
+          :price => get_price(product, product.profile.environment),
           :description => product.description,
           :picture => product.default_image(:minor),
           :quantity => quantity
-include ShoppingCartPlugin::CartHelper
-
 class ShoppingCartPluginMyprofileController < MyProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-
   def edit
     params[:settings] = treat_cart_options(params[:settings])
@@ -23,8 +23,8 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   end
   def add_to_cart_button(item)
-    enterprise = item.enterprise
-    settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    profile = item.profile
+    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
     if settings.enabled && item.available
        lambda {
          link_to(_('Add to basket'), "add:#{item.name}",
@@ -11,7 +11,7 @@ jQuery(document).ready(function(){
 jQuery('#delivery_option').change(function(){
   jQuery('#cboxLoadingGraphic').show();
   me = this;
-  enterprise = jQuery(me).attr('data-profile-identifier');
+  profile = jQuery(me).attr('data-profile-identifier');
   option = jQuery(me).val();
   jQuery.ajax({
     url: '/plugin/shopping_cart/update_delivery_option',
@@ -10,10 +10,10 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
     @controller = ShoppingCartPluginController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @enterprise = fast_create(Enterprise)
-    @product = fast_create(Product, :profile_id => @enterprise.id)
+    @profile = fast_create(Enterprise)
+    @product = fast_create(Product, :profile_id => @profile.id)
   end
-  attr_reader :enterprise
+  attr_reader :profile
   attr_reader :product
   should 'force cookie expiration with explicit path for an empty cart' do
@@ -62,7 +62,7 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
   end
   should 'just remove product if there are other products on cart' do
-    another_product = fast_create(Product, :profile_id => enterprise.id)
+    another_product = fast_create(Product, :profile_id => profile.id)
     get :add, :id => product.id
     get :add, :id => another_product.id
@@ -135,7 +135,7 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
   end
   should 'clean the cart' do
-    another_product = fast_create(Product, :profile_id => enterprise.id)
+    another_product = fast_create(Product, :profile_id => profile.id)
     get :add, :id => product.id
     get :add, :id => another_product.id
@@ -150,9 +150,9 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
   end
   should 'register order on send request' do
-    product1 = fast_create(Product, :profile_id => enterprise.id, :price => 1.99)
-    product2 = fast_create(Product, :profile_id => enterprise.id, :price => 2.23)
-    @controller.stubs(:cart).returns({ :profile_id => enterprise.id, :items => {product1.id => 1, product2.id => 2}})
+    product1 = fast_create(Product, :profile_id => profile.id, :price => 1.99)
+    product2 = fast_create(Product, :profile_id => profile.id, :price => 2.23)
+    @controller.stubs(:cart).returns({ :profile_id => profile.id, :items => {product1.id => 1, product2.id => 2}})
     assert_difference 'ShoppingCartPlugin::PurchaseOrder.count', 1 do
       post :send_request,
         :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
@@ -168,8 +168,8 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
   end
   should 'register order on send request and not crash if product is not defined' do
-    product1 = fast_create(Product, :profile_id => enterprise.id)
-    @controller.stubs(:cart).returns({ :profile_id => enterprise.id, :items => {product1.id => 1}})
+    product1 = fast_create(Product, :profile_id => profile.id)
+    @controller.stubs(:cart).returns({ :profile_id => profile.id, :items => {product1.id => 1}})
     assert_difference 'ShoppingCartPlugin::PurchaseOrder.count', 1 do
       post :send_request,
         :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
@@ -181,7 +181,7 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
   end
   should 'clean the cart after placing the order' do
-    product1 = fast_create(Product, :profile_id => enterprise.id)
+    product1 = fast_create(Product, :profile_id => profile.id)
     post :add, :id => product1.id
     post :send_request, :customer => { :name => "Manuel", :email => "manuel@ceu.com" }
     assert !cart?, "cart expected to be empty!"
@@ -5,17 +5,17 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   TIME_FORMAT = '%Y-%m-%d'
   def setup
-    @enterprise = fast_create(Enterprise)
+    @profile = fast_create(Enterprise)
     @admin = create_user('admin').person
-    @enterprise.add_admin(@admin)
+    @profile.add_admin(@admin)
     login_as(@admin.identifier)
   end
-  attr_reader :enterprise
+  attr_reader :profile
   should 'be able to enable shopping cart' do
     settings.enabled = false
     settings.save!
-    post :edit, :profile => enterprise.identifier, :settings => {:enabled => '1'}
+    post :edit, :profile => profile.identifier, :settings => {:enabled => '1'}
     assert settings.enabled
   end
@@ -23,7 +23,7 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'be able to disable shopping cart' do
     settings.enabled = true
     settings.save!
-    post :edit, :profile => enterprise.identifier, :settings => {:enabled => '0'}
+    post :edit, :profile => profile.identifier, :settings => {:enabled => '0'}
     assert !settings.enabled
   end
@@ -31,7 +31,7 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'be able to enable shopping cart delivery' do
     settings.delivery = false
     settings.save!
-    post :edit, :profile => enterprise.identifier, :settings => {:delivery => '1'}
+    post :edit, :profile => profile.identifier, :settings => {:delivery => '1'}
     assert settings.delivery
   end
@@ -39,37 +39,37 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'be able to disable shopping cart delivery' do
     settings.delivery = true
     settings.save!
-    post :edit, :profile => enterprise.identifier, :settings => {:delivery => '0'}
+    post :edit, :profile => profile.identifier, :settings => {:delivery => '0'}
     assert !settings.delivery
   end
   should 'be able to choose the delivery price' do
     price = 4.35
-    post :edit, :profile => enterprise.identifier, :settings => {:delivery_price => price}
+    post :edit, :profile => profile.identifier, :settings => {:delivery_price => price}
     assert settings.delivery_price == price.to_s
   end
   should 'be able to choose delivery_options' do
     delivery_options = {:options => ['car', 'bike'], :prices => ['20', '5']}
-    post :edit, :profile => enterprise.identifier, :settings => {:delivery_options => delivery_options}
+    post :edit, :profile => profile.identifier, :settings => {:delivery_options => delivery_options}
     assert_equal '20', settings.delivery_options['car']
     assert_equal '5', settings.delivery_options['bike']
   end
   should 'filter the reports correctly' do
-    another_enterprise = fast_create(Enterprise)
-    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
-    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED)
-    po3 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    another_profile = fast_create(Enterprise)
+    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED)
+    po3 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
     po3.created_at = 1.year.ago
     po3.save!
-    po4 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => another_enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po4 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => another_profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
     post :reports,
-      :profile => enterprise.identifier,
+      :profile => profile.identifier,
       :from => (Time.now - 1.day).strftime(TIME_FORMAT),
       :to => (Time.now + 1.day).strftime(TIME_FORMAT),
       :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
@@ -81,16 +81,16 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
   should 'group filtered orders products and quantities' do
-    p1 = fast_create(Product, :profile_id => enterprise.id, :price => 1, :name => 'p1')
-    p2 = fast_create(Product, :profile_id => enterprise.id, :price => 2, :name => 'p2')
-    p3 = fast_create(Product, :profile_id => enterprise.id, :price => 3)
+    p1 = fast_create(Product, :profile_id => profile.id, :price => 1, :name => 'p1')
+    p2 = fast_create(Product, :profile_id => profile.id, :price => 2, :name => 'p2')
+    p3 = fast_create(Product, :profile_id => profile.id, :price => 3)
     po1_products = {p1.id => {:quantity => 1, :price => p1.price, :name => p1.name}, p2.id => {:quantity => 2, :price => p2.price, :name => p2.name }}
     po2_products = {p2.id => {:quantity => 1, :price => p2.price, :name => p2.name }, p3.id => {:quantity => 2, :price => p3.price, :name => p3.name}}
-    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :products_list => po1_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
-    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :products_list => po2_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :products_list => po1_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :products_list => po2_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
     post :reports,
-      :profile => enterprise.identifier,
+      :profile => profile.identifier,
       :from => (Time.now - 1.day).strftime(TIME_FORMAT),
       :to => (Time.now + 1.day).strftime(TIME_FORMAT),
       :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
@@ -107,10 +107,10 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
   should 'be able to update the order status' do
-    po = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
     post :update_order_status,
-      :profile => enterprise.identifier,
+      :profile => profile.identifier,
       :order_id => po.id,
       :order_status => ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED
     po.reload
@@ -120,7 +120,7 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   private
   def settings
-    @enterprise.reload
-    Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
+    @profile.reload
+    Noosfero::Plugin::Settings.new(@profile, ShoppingCartPlugin)
   end
 end
@@ -19,16 +19,16 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
   end
   should 'not add button if product unavailable' do
-    enterprise = fast_create(:enterprise)
-    product = fast_create(Product, :available => false, :profile_id => enterprise.id)
-    enterprise.stubs(:shopping_cart).returns(true)
+    profile = fast_create(:enterprise)
+    product = fast_create(Product, :available => false, :profile_id => profile.id)
+    profile.stubs(:shopping_cart).returns(true)
     assert_nil shopping_cart.add_to_cart_button(product)
   end
   should 'be disabled by default on the enterprise' do
-    enterprise = fast_create(Enterprise)
-    settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    profile = fast_create(Enterprise)
+    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
     assert !settings.enabled
   end
 end
@@ -5,7 +5,7 @@
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
       <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
       <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
-      <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @enterprise.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %>
+      <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @profile.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %>
       <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('shopping_cart|Check'), :check]]))) %>
       <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %>
     </div>
@@ -23,7 +23,7 @@
     </div>
   <% end %>
   <% delivery_option = @settings.delivery_options.first && @settings.delivery_options.first.first %>
-  <%= items_table(@cart[:items], @enterprise, delivery_option) %>
+  <%= items_table(@cart[:items], @profile, delivery_option) %>
   <%= link_to '', '#', :onclick => "Cart.colorbox_close(this);", :class => 'cart-box-close icon-cancel' %>
 </div>
 <h1> <%= _('Purchase Reports') %> </h1>
 <% extend ProfileHelper %>
+<% extend ShoppingCartPlugin::CartHelper %>
 <% status = ShoppingCartPlugin::PurchaseOrder::Status.name; pos=-1 %>
 <% status_collection = [[nil, _('All')]] %>
@@ -40,6 +40,7 @@ class Article
     :if => proc{ |a| ! ['RssFeed'].include?(a.class.name) }
   handle_asynchronously :solr_save
+  handle_asynchronously :solr_destroy
   def solr_plugin_comments_updated
     solr_save
@@ -15,6 +15,7 @@ class Category
   ]
   handle_asynchronously :solr_save
+  handle_asynchronously :solr_destroy
   private
+Object.send :remove_const, :SearchController if defined? SearchController and not ActionController::Base.perform_caching
 require_dependency 'search_controller'
 module SolrPlugin::FacetsBrowse
@@ -43,6 +43,7 @@ class Product
     :boost => proc{ |p| boost = 1; SolrPlugin::Boosts.each{ |b| boost = boost * (1 - ((1 - b[2].call(p)) * b[1])) }; boost}
   handle_asynchronously :solr_save
+  handle_asynchronously :solr_destroy
   private
@@ -14,10 +14,11 @@ class Profile
       :solr_plugin_f_enabled => {:label => _('Situation'), :type_if => proc { |klass| klass.kind_of?(Enterprise) },
         :proc => proc { |id| solr_plugin_f_enabled_proc(id) }},
       :solr_plugin_f_region => {:label => _('City'), :proc => proc { |id| solr_plugin_f_region_proc(id) }},
+      :solr_plugin_f_profile_type => {:label => _('Type'), :proc => proc{|klass| solr_plugin_f_profile_type_proc(klass)}},
       :solr_plugin_f_categories => {:multi => true, :proc => proc {|facet, id| solr_plugin_f_categories_proc(facet, id)},
         :label => proc { |env| solr_plugin_f_categories_label_proc(env) }, :label_abbrev => proc{ |env| solr_plugin_f_categories_label_abbrev_proc(env) }},
     }, :category_query => proc { |c| "solr_plugin_category_filter:#{c.id}" },
-    :order => [:solr_plugin_f_region, :solr_plugin_f_categories, :solr_plugin_f_enabled]
+    :order => [:solr_plugin_f_region, :solr_plugin_f_categories, :solr_plugin_f_enabled, :solr_plugin_f_profile_type]
   acts_as_searchable :fields => facets_fields_for_solr + [:solr_plugin_extra_data_for_index,
       # searched fields
@@ -39,6 +40,7 @@ class Profile
     :boost => proc{ |p| 10 if p.enabled }
   handle_asynchronously :solr_save
+  handle_asynchronously :solr_destroy
   class_inheritable_accessor :solr_plugin_extra_index_methods
   self.solr_plugin_extra_index_methods = []
@@ -116,4 +118,13 @@ class Profile
   def solr_plugin_name_sortable
     name
   end
+
+  def solr_plugin_f_profile_type
+    self.class.name
+  end
+
+  def self.solr_plugin_f_profile_type_proc klass
+    klass.constantize.type_name
+  end
+
 end
	@@ -61,7 +61,10 @@ GEM		@@ -61,7 +61,10 @@ GEM
61	database_cleaner (1.2.0)	61	database_cleaner (1.2.0)
62	diff-lcs (1.1.3)	62	diff-lcs (1.1.3)
63	erubis (2.7.0)	63	erubis (2.7.0)
64	- eventmachine (0.12.11)	64	+ eventmachine (0.12.10)
		65	+ exception_notification (4.0.1)
		66	+ actionmailer (>= 3.0.4)
		67	+ activesupport (>= 3.0.4)
65	fast_gettext (0.6.8)	68	fast_gettext (0.6.8)
66	ffi (1.0.11)	69	ffi (1.0.11)
67	gherkin (2.4.21)	70	gherkin (2.4.21)
	@@ -167,6 +170,7 @@ DEPENDENCIES		@@ -167,6 +170,7 @@ DEPENDENCIES
167	daemons	170	daemons
168	dalli	171	dalli
169	database_cleaner	172	database_cleaner
		173	+ exception_notification
170	fast_gettext	174	fast_gettext
171	hpricot	175	hpricot
172	mocha	176	mocha
1	#!/usr/bin/env rake	1	#!/usr/bin/env rake
		2	+
2	# Add your own tasks in files placed in lib/tasks ending in .rake,	3	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.	4	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4		5
	@@ -2,7 +2,7 @@ class AccountController < ApplicationController		@@ -2,7 +2,7 @@ class AccountController < ApplicationController
2		2
3	no_design_blocks	3	no_design_blocks
4		4
5	- before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]	5	+ before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise, :change_password]
6	before_filter :redirect_if_logged_in, :only => [:login, :signup]	6	before_filter :redirect_if_logged_in, :only => [:login, :signup]
7	before_filter :protect_from_bots, :only => :signup	7	before_filter :protect_from_bots, :only => :signup
8		8
	@@ -11,7 +11,7 @@ class CatalogController < PublicController		@@ -11,7 +11,7 @@ class CatalogController < PublicController
11	protected	11	protected
12		12
13	def check_enterprise_and_environment	13	def check_enterprise_and_environment
14	- unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')	14	+ unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'	15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
16	end	16	end
17	end	17	end
	@@ -10,7 +10,7 @@ module ContentViewerHelper		@@ -10,7 +10,7 @@ module ContentViewerHelper
10	end	10	end
11		11
12	def number_of_comments(article)	12	def number_of_comments(article)
13	- display_number_of_comments(article.comments.without_spam.count)	13	+ display_number_of_comments(article.comments_count - article.spam_comments_count)
14	end	14	end
15		15
16	def article_title(article, args = {})	16	def article_title(article, args = {})
	@@ -26,7 +26,7 @@ module ContentViewerHelper		@@ -26,7 +26,7 @@ module ContentViewerHelper
26	end	26	end
27	title << content_tag('span',	27	title << content_tag('span',
28	content_tag('span', show_date(article.published_at), :class => 'date') +	28	content_tag('span', show_date(article.published_at), :class => 'date') +
29	- content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +	29	+ content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	30	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	31	:class => 'created-at'
32	)	32	)
	@@ -2,7 +2,7 @@ require 'noosfero/multi_tenancy'		@@ -2,7 +2,7 @@ require 'noosfero/multi_tenancy'
2		2
3	class Domain < ActiveRecord::Base	3	class Domain < ActiveRecord::Base
4		4
5	- attr_accessible :name, :owner	5	+ attr_accessible :name, :owner, :is_default
6		6
7	# relationships	7	# relationships
8	###############	8	###############
1	class FeaturedProductsBlock < Block	1	class FeaturedProductsBlock < Block
2		2
		3	+ attr_accessible :product_ids, :groups_of, :speed, :reflect
		4	+
3	settings_items :product_ids, :type => Array, :default => []	5	settings_items :product_ids, :type => Array, :default => []
4	settings_items :groups_of, :type => :integer, :default => 3	6	settings_items :groups_of, :type => :integer, :default => 3
5	settings_items :speed, :type => :integer, :default => 1000	7	settings_items :speed, :type => :integer, :default => 1000
1	class HighlightsBlock < Block	1	class HighlightsBlock < Block
2		2
3	- attr_accessible :images	3	+ attr_accessible :images, :interval, :shuffle, :navigation
4		4
5	settings_items :images, :type => Array, :default => []	5	settings_items :images, :type => Array, :default => []
6	settings_items :interval, :type => 'integer', :default => 4	6	settings_items :interval, :type => 'integer', :default => 4
1	class LocationBlock < Block	1	class LocationBlock < Block
2		2
		3	+ attr_accessible :zoom, :map_type
		4	+
3	settings_items :zoom, :type => :integer, :default => 4	5	settings_items :zoom, :type => :integer, :default => 4
4	settings_items :map_type, :type => :string, :default => 'roadmap'	6	settings_items :map_type, :type => :string, :default => 'roadmap'
5		7
	@@ -33,7 +33,7 @@ class ProductCategoriesBlock < Block		@@ -33,7 +33,7 @@ class ProductCategoriesBlock < Block
33	end	33	end
34	end	34	end
35		35
36	- DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')	36	+ DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
37		37
38	def display	38	def display
39	settings[:display].nil? ? 'catalog_only' : super	39	settings[:display].nil? ? 'catalog_only' : super