Merge branches 'stable_colivre' and 'ActionItem2823' into ActionItem2823

Leandro Nunes dos Santos
2 parents 4ed9e248 ce0d03ab
Showing 154 changed files with 756 additions and 610 deletions Show diff stats
AUTHORS
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/catalog_controller.rb
app/helpers/boxes_helper.rb
app/helpers/cms_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/profile_helper.rb
app/models/action_tracker_notification.rb
app/models/article.rb
app/models/category.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/featured_products_block.rb
app/models/person.rb
app/models/price_detail.rb
app/models/product.rb
app/models/profile.rb
app/models/profile_list_block.rb
app/models/region.rb
@@ -44,6 +44,7 @@ Antonio Terceiro &lt;terceiro@colivre.coop.br&gt;
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
+Braulio Bhavamitra <braulio@eita.org.br>
 Caio <caio.csalgado@gmail.com>
 Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
 Caio Formiga <caio.formiga@gmail.com>
@@ -147,6 +148,7 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
@@ -6,10 +6,10 @@ class ManageProductsController &lt; ApplicationController
   before_filter :login_required, :except => [:show]
   before_filter :create_product?, :only => [:new]
  
-  protected  
+  protected
  
   def check_environment_feature
-    if profile.environment.enabled?('disable_products_for_enterprises')
+    unless profile.environment.enabled?('products_for_enterprises')
       render_not_found
       return
     end
@@ -38,7 +38,7 @@ class ProfileDesignController &lt; BoxOrganizerController
     end
  
     # product block exclusive for enterprises in environments that permits it
-    if profile.enterprise? && !profile.environment.enabled?('disable_products_for_enterprises')
+    if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
       blocks << ProductsBlock
     end
  
@@ -12,7 +12,7 @@ class CatalogController &lt; PublicController
   protected
  
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises')
+    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -99,9 +99,11 @@ module BoxesHelper
     unless block.visible?
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
+
     if @controller.send(:content_editor?)
       result = filter_html(result, block)
     end
+
     box_decorator.block_target(block.box, block) +
       content_tag('div',
        content_tag('div',
@@ -28,7 +28,7 @@ module CmsHelper
   end
  
   def link_to_article(article)
-    article_name = short_filename(article.title, 30)
+    article_name = article.title
     if article.folder?
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
@@ -136,7 +136,7 @@ module ProfileEditorHelper
     concat(
       content_tag(
         'div',
-        capture(&block) + content_tag('br', '', :style => 'clear: left'),
+        capture(&block) + tag('br', :style => 'clear: left'),
         :class => 'control-panel')
     )
   end
 module ProfileHelper
  
   def display_field(title, profile, field, force = false)
-    if (!force && !profile.active_fields.include?(field.to_s)) ||
-       (profile.active_fields.include?(field.to_s) && !profile.public_fields.include?(field.to_s) && (!user || (user != profile && !user.is_a_friend?(profile))))
+    unless force || profile.may_display_field_to?(field, user)
       return ''
     end
     value = profile.send(field)
@@ -3,7 +3,7 @@ class ActionTrackerNotification &lt; ActiveRecord::Base
   belongs_to :profile
   belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
  
-  has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
+  delegate :comments, :to => :action_tracker, :allow_nil => true
  
   validates_presence_of :profile_id, :action_tracker_id
   validates_uniqueness_of :action_tracker_id, :scope => :profile_id
@@ -57,7 +57,7 @@ class Article &lt; ActiveRecord::Base
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
  
-  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy
+  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
   has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
  
   acts_as_having_settings :field => :setting
@@ -22,23 +22,15 @@ class Category &lt; ActiveRecord::Base
  
   named_scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
  
-  named_scope :sub_categories, lambda { |category|
-    {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
-  }
-
-  named_scope :sub_tree, lambda { |category|
-    {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
-  }
-
   acts_as_filesystem
  
-  has_many :article_categorizations, :dependent => :destroy
+  has_many :article_categorizations
   has_many :articles, :through => :article_categorizations
   has_many :comments, :through => :articles
  
   has_many :events, :through => :article_categorizations, :class_name => 'Event', :source => :article
  
-  has_many :profile_categorizations, :dependent => :destroy
+  has_many :profile_categorizations
   has_many :profiles, :through => :profile_categorizations, :source => :profile
   has_many :enterprises, :through => :profile_categorizations, :source => :profile, :class_name => 'Enterprise'
   has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'
@@ -134,7 +134,7 @@ class Enterprise &lt; Organization
       [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
       []
     ]
-    if !environment.enabled?('disable_products_for_enterprises')
+    if environment.enabled?('products_for_enterprises')
       blocks[2].unshift ProductsBlock.new
     end
     blocks
@@ -95,7 +95,6 @@ class Environment &lt; ActiveRecord::Base
       'disable_asset_communities' => __('Disable search for communities'),
       'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
-      'disable_products_for_enterprises' => __('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
       'disable_gender_icon' => _('Disable gender icon'),
@@ -103,9 +102,13 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
-      'enterprise_registration' => __('Enterprise registration'),
  
+      'products_for_enterprises' => __('Enable products for enterprises'),
+      'enterprise_registration' => __('Enterprise registration'),
       'enterprise_activation' => __('Enable activation of enterprises'),
+      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
+      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
+
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -118,8 +121,6 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
-      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
@@ -281,8 +282,9 @@ class Environment &lt; ActiveRecord::Base
   end
  
   # Enables a feature identified by its name
-  def enable(feature)
+  def enable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = true
+    self.save! if must_save
   end
  
   def enable_plugin(plugin)
@@ -292,8 +294,9 @@ class Environment &lt; ActiveRecord::Base
   end
  
   # Disables a feature identified by its name
-  def disable(feature)
+  def disable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = false
+    self.save! if must_save
   end
  
   def disable_plugin(plugin)
@@ -337,7 +340,7 @@ class Environment &lt; ActiveRecord::Base
     %w(
       disable_asset_products
       disable_gender_icon
-      disable_products_for_enterprises
+      products_for_enterprises
       disable_select_city_for_contact
       enterprise_registration
       media_panel
@@ -345,7 +348,7 @@ class Environment &lt; ActiveRecord::Base
       show_balloon_with_profile_links_when_clicked
       use_portal_community
     ).each do |feature|
-      enable(feature)
+      enable(feature, false)
     end
   end
  
@@ -7,8 +7,9 @@ class FeaturedProductsBlock &lt; Block
  
   before_save do |block|
     if block.owner.kind_of?(Environment) && block.product_ids.blank?
-      seed = block.owner.products.count
-      block.product_ids = block.owner.highlighted_products_with_image(:offset => (rand(seed) % (seed - block.groups_of * 3)), :limit => block.groups_of * 3).map(&:id)
+      total = block.owner.products.count
+      offset = rand([(total - block.groups_of * 3) + 1, 1].max)
+      block.product_ids = block.owner.highlighted_products_with_image(:offset => offset, :limit => block.groups_of * 3).map(&:id)
     end
     block.groups_of = block.groups_of.to_i
   end
@@ -471,8 +471,9 @@ class Person &lt; Profile
     Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
   end
  
+  # by default, all fields are private
   def public_fields
-    self.fields_privacy.nil? ? self.active_fields : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
+    self.fields_privacy.nil? ? [] : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
   end
  
   protected
@@ -4,11 +4,11 @@ class PriceDetail &lt; ActiveRecord::Base
   validates_presence_of :product_id
  
   belongs_to :production_cost
-  validates_presence_of :production_cost
+  # Do not validates_presence_of production_cost. We may have undefined other costs.
   validates_uniqueness_of :production_cost_id, :scope => :product_id
  
   def name
-    production_cost.name
+    production_cost.nil? ? _('Other costs') : production_cost.name
   end
  
   def price
@@ -191,11 +191,13 @@ class Product &lt; ActiveRecord::Base
     (price - total_production_cost.to_f).zero?
   end
  
-  def update_price_details(price_details)
-    self.price_details.destroy_all
-    price_details.each do |price_detail|
-      self.price_details.create(price_detail)
+  def update_price_details(new_price_details)
+    price_details.destroy_all
+    new_price_details.each do |detail|
+      price_details.create(detail)
     end
+    reload # to remove temporary duplicated price_details
+    price_details
   end
  
   def price_description_percentage
@@ -226,12 +226,14 @@ class Profile &lt; ActiveRecord::Base
  
   belongs_to :region
  
+  LOCATION_FIELDS = %w[address district city state country_name zip_code]
+
   def location(separator = ' - ')
     myregion = self.region
     if myregion
       myregion.hierarchy.reverse.first(2).map(&:name).join(separator)
     else
-      %w[address district city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
+      LOCATION_FIELDS.map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
     end
   end
  
@@ -882,6 +884,21 @@ private :generate_url, :url_options
     []
   end
  
+  def may_display_field_to? field, user = nil
+    if not self.active_fields.include? field.to_s
+      self.send "may_display_#{field}_to?", user rescue true
+    else
+      not (!self.public_fields.include? field.to_s and (!user or (user != self and !user.is_a_friend?(self))))
+    end
+  end
+
+  def may_display_location_to? user = nil
+    LOCATION_FIELDS.each do |field|
+      return false if !self.may_display_field_to? field, user
+    end
+    return true
+  end
+
   # field => privacy (e.g.: "address" => "public")
   def fields_privacy
     self.data[:fields_privacy]
@@ -54,7 +54,7 @@ class ProfileListBlock &lt; Block
         list = content_tag 'ul', nl +'  '+ list + nl
       end
       block_title(title) + nl +
-      content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))
+      content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
     end
   end
  
@@ -8,9 +8,9 @@ class Region &lt; Category
     validators.count > 0
   end
  
-  named_scope :with_validators, :group => 'id',
+  named_scope :with_validators, :select => 'DISTINCT ON (categories.id) *',
     :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
-  
+
 end
  
 require_dependency 'city'
@@ -4,7 +4,7 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   include SweeperHelper
  
   def after_update(profile)
-    expire_caches(profile)
+    self.delay.expire_caches profile
   end
  
   def after_create(profile)
@@ -17,7 +17,7 @@
 <ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
-  <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+  <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
   <li id="profile-admin-url-<%= block.id %>"></li>
@@ -41,7 +41,7 @@
   <% end %>
  
   <% @articles.each do |article| %>
-    <tr>
+    <tr title="<%= article.title%>" >
       <td>
         <%= link_to_article(article) %>
       </td>
 <%= display_profile_info enterprise_homepage.profile %>
 <div><%= enterprise_homepage.body %></div>
-<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>
+<%= render :file => 'catalog/index' if enterprise_homepage.profile.environment.enabled?('products_for_enterprises') %>
@@ -10,7 +10,7 @@
     </li>
     <% @product.price_details.each do |price_detail| %>
       <li>
-        <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>
+        <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
         <div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
       </li>
     <% end %>
 <% price_details.each do |price_detail| %>
   <tr id='<%= "price-detail-#{price_detail.id}" %>'>
     <td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
-    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>
+    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
     <td>
       <%= link_to_remote(_('Remove'),
                          :update => "price-detail-#{price_detail.id}",
@@ -34,7 +34,7 @@
   <table id='new-cost-fields'>
     <tr>
       <td><%= select_production_cost(@product) %></td>
-      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>
+      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
       <td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
     </tr>
   </table>
@@ -19,7 +19,7 @@
     <td><%= show_date(profile.created_at) %></td>
   </tr>
  
-  <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
+  <% if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises') %>
     <tr>
       <td></td>
       <td>
@@ -18,18 +18,6 @@
   <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
     <%= display_work_info profile %>
  
-    <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
-      <tr>
-        <th colspan='2'><%= __('Enterprises') %></th>
-      </tr>
-      <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
-        <tr>
-          <td></td>
-          <td><%= button 'menu-enterprise', item.name, item.url %></td>
-        </tr>
-      <% end %>
-    <% end %>
-
     <tr>
       <th colspan='2'><%= _('Network')%></th>
     </tr>
@@ -41,6 +29,12 @@
       <td><%= __('Communities') + ':' %></td>
       <td><%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %></td>
     </tr>
+    <% if environment.disabled?('disable_asset_enterprises') %>
+      <tr id="person-profile-network-enterprises">
+        <td><%= __('Enterprises') + ':' %></td>
+        <td><%= link_to profile.enterprises.count, :controller => "profile", :action => 'enterprises' %></td>
+      </tr>
+    <% end %>
  
     <%= render :partial => 'common' %>
  
@@ -45,7 +45,7 @@
  
   <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
  
-  <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && !environment.enabled?('disable_products_for_enterprises') %>
+  <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
  
   <% if !environment.enabled?('disable_asset_enterprises') %>
     <% if profile.is_validation_entity? %>
@@ -10,7 +10,7 @@
     <th><%= _('Actions') %></th>
   </tr>
   <% collection.each do |m| %>
-    <tr>
+    <tr title="<%= m.name %>">
       <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
       <td>
         <div class="members-buttons-cell">
 <li class="search-article-item article-item">
-  <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  <div>
+    <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => article %>
   </div>
+
   <table class="noborder search-content-second-column">
     <%= render :partial => 'article_common', :object => article %>
   </table>
 <li class="search-blog article-item">
-  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => blog %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-blog-items">
       <td class="search-field-label"><%= _("Last posts") %></td>
 <li class="search-event-item article-item">
-<%= link_to(event.title, event.url, :class => "search-result-title") %>
-<div class="search-content-first-column">
-  <%= render :partial => 'image', :object => event %>
-</div>
-<table class="noborder search-content-second-column">
-  <% if event.start_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('Start date') %></td>
-      <td class="article-item-date"><%= event.start_date %></td>
-    </tr>
-  <% end %>
-  <% if event.end_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('End date') %></td>
-      <td class="article-item-date"><%= event.end_date %></td>
-    </tr>
-  <% end %>
+  <div>
+    <%= link_to(event.title, event.url, :class => "search-result-title") %>
+  </div>
  
-  <%= render :partial => 'article_common', :object => event %>
-</table>
-<%= render :partial => 'article_last_change', :object => event %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => event %>
+  </div>
  
-<div style="clear: both"></div>
+  <table class="noborder search-content-second-column">
+    <% if event.start_date %>
+      <tr class="search-article-event-date">
+        <td class="search-field-label"><%= _('Start date') %></td>
+        <td class="article-item-date"><%= event.start_date %></td>
+      </tr>
+    <% end %>
+    <% if event.end_date %>
+      <tr class="search-article-event-date">
+        <td class="search-field-label"><%= _('End date') %></td>
+        <td class="article-item-date"><%= event.end_date %></td>
+      </tr>
+    <% end %>
+
+    <%= render :partial => 'article_common', :object => event %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => event %>
+
+  <div style="clear: both"></div>
 </li>
 <li class="search-folder-item article-item">
-  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => folder %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-folder-items">
       <td class="search-field-label"><%= _("Last items") %></td>
 <li class="search-forum-item article-item">
-  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => forum %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-forum-items">
       <td class="search-field-label"><%= _("Last topics") %></td>
 <li class="search-gallery article-item">
-  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => gallery %>
   </div>
+
   <table class="noborder search-content-second-column">
     <%= render :partial => 'article_common', :object => gallery %>
   </table>
 <li class="search-text-article-item article-item">
-  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+  <div>
+    <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+  </div>
  
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => text_article %>
 <li class="search-uploaded-file-item article-item">
-  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+  </div>
  
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => uploaded_file %>
@@ -70,7 +70,7 @@ tinyMCE.init({
   paste_insert_word_content_callback : "convertWord",
   paste_use_dialog: false,
   apply_source_formatting : true,
-  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width]",
+  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width],audio[controls|autoplay],video[controls|autoplay],source[src|type]",
   content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
   language: <%= tinymce_language.inspect %>,
   entity_encoding: 'raw',
@@ -85,10 +85,10 @@ Rails::Initializer.run do |config|
   }
  
   # Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
-  config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder'
+  config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay'
  
    # Adds custom tags to the Set of allowed html tags for the #sanitize helper
-  config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe'
+  config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe', 'audio', 'video', 'source'
  
   # See Rails::Configuration for more options
  
@@ -0,0 +1,21 @@
+class RenameEnvironmentSettingDisableProducts < ActiveRecord::Migration
+  def self.up
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.settings[:products_for_enterprises_enabled] =
+         !env.settings[:disable_products_for_enterprises_enabled]
+      env.settings.delete :disable_products_for_enterprises_enabled
+      env.save!
+    end
+  end
+
+  def self.down
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.settings[:disable_products_for_enterprises_enabled] =
+         !env.settings[:products_for_enterprises_enabled]
+      env.settings.delete :products_for_enterprises_enabled
+      env.save!
+    end
+  end
+end
@@ -221,7 +221,6 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
-    t.integer  "group_id"
   end
  
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
+noosfero (0.44.4) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Mon, 07 Oct 2013 13:38:31 -0300
+
 noosfero (0.44.3) unstable; urgency=low
  
   * Bugfixes release
@@ -64,8 +64,8 @@ Feature: edit article
     And I fill in "Tag list" with "aurium, bug"
     And I press "Save"
     And I go to /joaosilva/article-with-tags
-    Then I should see "aurium" within "#article-tags a:first"
-    And I should see "bug" within "#article-tags a:last"
+    Then I should see "aurium" within "#article-tags"
+    And I should see "bug" within "#article-tags"
  
   Scenario: redirect to the created article
     Given I am on joaosilva's control panel
@@ -17,7 +17,7 @@ Feature: remove administrator role
   Scenario: the last administrator removes his administrator role and must choose the new administrator
     Given "Maria Souza" is a member of "Nice people"
     And I am on Nice people's members management
-    And I follow "Edit"
+    And I follow "Edit" within "tr[title='Joao Silva']"
     And I uncheck "Profile Administrator"
     When I press "Save changes"
     Then I should see "Since you are the last administrator, you must choose"
@@ -22,27 +22,27 @@ Feature: plugins
       | profile_tabs          | lambda { {:title => 'Test plugin tab', :id => 'test_plugin', :content => lambda {'Test plugin random content'} } } |
  
   Scenario: a user must see the plugin\'s button in the control panel if the plugin is enabled
-    Given plugin TestPlugin is enabled on environment
+    Given plugin Test is enabled on environment
     And I go to joaosilva's control panel
     Then I should see "Test plugin button"
  
   Scenario: a user must see the plugin\'s tab in in the profile if the plugin is enabled
-    Given plugin TestPlugin is enabled on environment
+    Given plugin Test is enabled on environment
     And I am on joaosilva's profile
     Then I should see "Test plugin tab"
  
   Scenario: a user must not see the plugin\'s button in the control panel if the plugin is disabled
-    Given plugin TestPlugin is disabled on environment
+    Given plugin Test is disabled on environment
     And I go to joaosilva's control panel
     Then I should not see "Test plugin button"
  
   Scenario: a user must not see the plugin\'s tab in in the profile if the plugin is disabled
-    Given plugin TestPlugin is disabled on environment
+    Given plugin Test is disabled on environment
     And I am on joaosilva's profile
     Then I should not see "Test plugin tab"
  
   Scenario: an admin should be able to deactivate a plugin
-    Given plugin TestPlugin is enabled on environment
+    Given plugin Test is enabled on environment
     And I am logged in as admin
     When I go to admin_user's control panel
     Then I should see "Test plugin button"
@@ -4,7 +4,8 @@ Feature: search communities
   In order to find ones that interest me
  
   Background:
-    Given the following category
+    Given plugin Solr is enabled on environment
+    And the following category
       | name           |
       | social network |
     And the following community
@@ -18,4 +18,4 @@ Feature: sitemap
   Scenario: view the CMS
     Given I am logged in as "joaosilva"
     When I am on /myprofile/joaosilva/cms
-    Then I should see "AGENDA_CULTURA_-_FEST(...).txt"
+    Then I should see "AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_(...).txt"
@@ -44,7 +44,7 @@ Given /^the following (community|communities|enterprises?|organizations?)$/ do |
     end
     if category && !category.blank?
       cat = Category.find_by_slug category
-      organization.categories << cat
+      ProfileCategorization.add_category_to_profile(cat, organization)
     end
     if img_name
       img = Image.create!(:uploaded_data => fixture_file_upload('/files/'+img_name+'.png', 'image/png'))
@@ -23,6 +23,7 @@ end
  
 Given /^plugin (.+) is (enabled|disabled) on environment$/ do |plugin, status|
   e = Environment.default
+  plugin = "#{plugin}Plugin"
   if status == 'enabled'
     e.enabled_plugins += [plugin]
   else
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.44.3'
+  VERSION = '0.44.4'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -64,6 +64,9 @@ class Noosfero::Plugin
         require init.gsub(/.rb$/, '') if File.file? init
       end
  
+      # load extensions
+      Dir[File.join(dir, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
+
       # load class
       klass(plugin_name)
     end
@@ -0,0 +1 @@
+raise "Not ready yet"
-require_dependency 'bsc_plugin/ext/enterprise'
-require_dependency 'bsc_plugin/ext/product'
-
 class BscPlugin < Noosfero::Plugin
  
   Bsc
-require_dependency 'comment_group_plugin/ext/article'
-require_dependency 'comment_group_plugin/ext/comment'
-
 class CommentGroupPlugin < Noosfero::Plugin
  
   def self.plugin_name
@@ -1,21 +0,0 @@
-require_dependency 'article'
-
-class Article
-
-  #FIXME make this test
-  has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
-
-  #FIXME make this test
-  validate :not_empty_group_comments_removed
-
-  #FIXME make this test
-  def not_empty_group_comments_removed
-    if body
-      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
-      groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
-      errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
-    end
-  end
-
-end
-
@@ -1,12 +0,0 @@
-require_dependency 'comment'
-
-class Comment
-
-  named_scope :without_group, :conditions => {:group_id => nil }
-
-  named_scope :in_group, lambda { |group_id| {
-      :conditions => ['group_id = ?', group_id]
-    }
-  }
-
-end
@@ -0,0 +1,21 @@
+require_dependency 'article'
+
+class Article
+
+  #FIXME make this test
+  has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
+
+  #FIXME make this test
+  validate :not_empty_group_comments_removed
+
+  #FIXME make this test
+  def not_empty_group_comments_removed
+    if body
+      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
+      groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
+      errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
+    end
+  end
+
+end
+
@@ -0,0 +1,12 @@
+require_dependency 'comment'
+
+class Comment
+
+  named_scope :without_group, :conditions => {:group_id => nil }
+
+  named_scope :in_group, lambda { |group_id| {
+      :conditions => ['group_id = ?', group_id]
+    }
+  }
+
+end
@@ -10,15 +10,17 @@ class CommentGroupPluginTest &lt; ActiveSupport::TestCase
  
   attr_reader :environment
  
-  should 'filter_comments returns all the comments wihout group of an article passed as parameter' do
-    article = fast_create(Article)
-    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
-    c2 = fast_create(Comment, :source_id => article.id)
-    c3 = fast_create(Comment, :source_id => article.id)
-
-    plugin = CommentGroupPlugin.new
-    assert_equal [], [c2, c3] - plugin.filter_comments(article.comments)
-    assert_equal [], plugin.filter_comments(article.comments) - [c2, c3]
-  end
+#FIXME Obsolete test
+#
+#  should 'filter_comments returns all the comments wihout group of an article passed as parameter' do
+#    article = fast_create(Article)
+#    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
+#    c2 = fast_create(Comment, :source_id => article.id)
+#    c3 = fast_create(Comment, :source_id => article.id)
+#
+#    plugin = CommentGroupPlugin.new
+#    assert_equal [], [c2, c3] - plugin.filter_comments(article.comments)
+#    assert_equal [], plugin.filter_comments(article.comments) - [c2, c3]
+#  end
  
 end
@@ -0,0 +1,9 @@
+class SetPositionToExistentCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    update("UPDATE custom_forms_plugin_fields SET position = 0 WHERE position IS NULL")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
-require 'ext/role_assignment_trigger'
-
 class CustomFormsPlugin < Noosfero::Plugin
  
   def self.plugin_name
@@ -15,8 +15,12 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
  
   before_create do |field|
     if field.form.fields.exists?
-      field.position = field.form.fields.order('position').last.position + 1
+      field.position = field.form.fields.order(:position).last.position + 1
     end
   end
+
+  def position
+    self[:position] || 0
+  end
 end
  
@@ -81,5 +81,17 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     assert_equal 1, field_1.position
     assert_equal 2, field_2.position
   end
+
+  should 'not crash when adding new fields on a form with fields without position' do
+    form = CustomFormsPlugin::Form.create(:name => 'Free Software', :profile => fast_create(Profile))
+    field_0 = CustomFormsPlugin::Field.create(:name => 'License', :form => form)
+    field_0.position = nil
+    field_0.save
+
+    assert_nothing_raised do
+      field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+    end
+  end
+
 end
  
@@ -41,7 +41,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     Article.delete_all
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal [], json_response
+    assert_equivalent [], json_response
   end
  
   should 'index action returns an json with node content' do
@@ -53,7 +53,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json = {'data' => article.title}
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with node checked if the node is in the nodes list' do
@@ -68,7 +68,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
     expected_json['attr'].merge!({'class' => 'jstree-checked'})
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
@@ -84,7 +84,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'].merge!({'class' => 'jstree-undetermined'})
     expected_json['children'] = []
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with node closed if the node has article with children' do
@@ -98,7 +98,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
     expected_json['state'] = 'closed'
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
@@ -121,7 +121,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['children'] = children
     expected_json['state'] = 'closed'
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
@@ -151,7 +151,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
  
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
  
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
@@ -173,7 +173,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
  
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
  
 end
@@ -41,7 +41,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     Article.delete_all
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal [], json_response
+    assert_equivalent [], json_response
   end
  
   should 'index action returns an json with node content' do
@@ -53,7 +53,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json = {'data' => article.title}
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with node checked if the node is in the nodes list' do
@@ -68,7 +68,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
     expected_json['attr'].merge!({'class' => 'jstree-checked'})
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
@@ -84,7 +84,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'].merge!({'class' => 'jstree-undetermined'})
     expected_json['children'] = []
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with node closed if the node has article with children' do
@@ -99,7 +99,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
     expected_json['state'] = 'closed'
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
@@ -122,7 +122,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['children'] = children
     expected_json['state'] = 'closed'
  
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
  
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
@@ -152,7 +152,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
  
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
  
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
@@ -174,7 +174,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
  
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
  
 end
@@ -0,0 +1,6 @@
+require_dependency 'profile'
+
+Profile.class_eval do
+  def bar
+  end
+end
-require_dependency 'foo_plugin/ext/profile'
-
 class FooPlugin < Noosfero::Plugin
  
   def self.plugin_name
@@ -1,6 +0,0 @@
-require_dependency 'profile'
-
-Profile.class_eval do
-  def bar
-  end
-end
-require_dependency File.dirname(__FILE__) + '/ext/profile'
-
 class GoogleAnalyticsPlugin < Noosfero::Plugin
  
   include ActionView::Helpers::JavaScriptHelper
+require 'rubygems'
 require 'net/ldap'
@@ -0,0 +1,5 @@
+system "gem install --user-install net-ldap -v 0.3.1"
+puts "\nWARNING: This plugin is not setting up a ldap test server automatically.
+Some tests may not be running. If you want to fully test this plugin, please
+setup the ldap test server and make the proper configurations on
+fixtures/ldap.yml.\n\n"
-require_dependency File.dirname(__FILE__) + '/ext/environment'
 require File.dirname(__FILE__) + '/ldap_authentication.rb'
  
-
 class LdapPlugin < Noosfero::Plugin
  
   def self.plugin_name
@@ -0,0 +1 @@
+raise "Not ready yet"
-require 'ext/active_record'
-
 class PgSearchPlugin < Noosfero::Plugin
  
   def self.plugin_name
@@ -0,0 +1,5 @@
+require_dependency 'profile'
+
+class Profile
+  settings_items :allow_unauthenticated_comments, :type => :boolean
+end
-require_dependency 'require_auth_to_comment_plugin/ext/profile'
-
 class RequireAuthToCommentPlugin < Noosfero::Plugin
  
   include ActionView::Helpers::TagHelper
@@ -1,5 +0,0 @@
-require_dependency 'profile'
-
-class Profile
-  settings_items :allow_unauthenticated_comments, :type => :boolean
-end
@@ -7,7 +7,7 @@ Feature: send_email_plugin
     And I am logged in as "joaosilva"
  
   Scenario: expand macro in article content
-    Given plugin SendEmailPlugin is enabled on environment
+    Given plugin SendEmail is enabled on environment
     And the following articles
       | owner | name | body |
       | joaosilva | sample-article | URL path to {sendemail} action |
@@ -15,7 +15,7 @@ Feature: send_email_plugin
     Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action"
  
   Scenario: expand macro in block content
-    Given plugin SendEmailPlugin is enabled on environment
+    Given plugin SendEmail is enabled on environment
     And the following blocks
       | owner     | type         | html |
       | joaosilva | RawHTMLBlock | URL path to {sendemail} action |
@@ -63,6 +63,7 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
  
   def treat_delivery_options(params)
     result = {}
+    return result if params.nil? || params[:delivery_options].nil?
     params[:options].size.times do |counter|
       if params[:options][counter].present? && params[:prices][counter].present?
         result[params[:options][counter]] = params[:prices][counter]
@@ -0,0 +1,5 @@
+require_dependency 'enterprise'
+
+class Enterprise
+  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
+end
@@ -0,0 +1,5 @@
+require_dependency 'person'
+
+class Person
+  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
+end
-require_dependency 'shopping_cart_plugin/ext/enterprise'
-require_dependency 'shopping_cart_plugin/ext/person'
-
 class ShoppingCartPlugin < Noosfero::Plugin
  
   class << self
@@ -1,5 +0,0 @@
-require_dependency 'enterprise'
-
-class Enterprise
-  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
-end
@@ -1,5 +0,0 @@
-require_dependency 'person'
-
-class Person
-  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
-end
@@ -38,7 +38,7 @@ class ShoppingCartPlugin::CartHelperTest &lt; ActiveSupport::TestCase
     value = 13.7
     environment = Environment.default
  
-    assert_equal "#{environment.currency_unit} 13#{environment.currency_separator}70", float_to_currency_cart(value,environment)
+    assert_equal "#{environment.currency_unit}13#{environment.currency_separator}70", float_to_currency_cart(value,environment)
   end
  
 end
@@ -19,10 +19,9 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
   end
  
   should 'not add button if product unavailable' do
-    product = fast_create(Product, :available => false)
-    enterprise = mock()
+    enterprise = fast_create(:enterprise)
+    product = fast_create(Product, :available => false, :enterprise_id => enterprise.id)
     enterprise.stubs(:shopping_cart).returns(true)
-    product.stubs(:enterprise).returns(enterprise)
  
     assert_nil shopping_cart.add_to_cart_button(product)
   end
@@ -5,6 +5,7 @@ Feature: search contents
  
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And the following users
     Given the following users
       | login     | name       |
@@ -5,6 +5,7 @@ Feature: search enterprises
  
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And the following enterprises
       | identifier | name        | img |
       | shop1      | Shoes shop  | shoes |
@@ -12,6 +13,7 @@ Feature: search enterprises
     And the following categories as facets
       | name      |
       | Temáticas |
+
   Scenario: see default facets when searching
     When I go to the search enterprises page
     And I fill in "search-input" with "shoes"
@@ -34,10 +36,10 @@ Feature: search enterprises
     When I go to the search enterprises page
     And I fill in "search-input" with "Artesanato"
     And I press "Search"
-    Then I should see "Pres. Prudente" within "#facet-menu-f_region"
-    And I should see ", SP" within "#facet-menu-f_region"
-    And I should see "City" within ".search-enterprise-region-label"
-    And I should see "Pres. Prudente, SP" within ".search-enterprise-region-name"
+    Then I should see "Pres. Prudente" within "#facet-menu-solr_plugin_f_region"
+    And I should see ", SP" within "#facet-menu-solr_plugin_f_region"
+    And I should see "City" within ".facet-menu-label"
+    And I should see "Pres. Prudente, SP" within ".facet-menu-item"
  
   Scenario: find enterprise by region
     Given the following cities
@@ -5,6 +5,7 @@ Feature: search people
  
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And the following users
       | login      | name        |
       | joaosilva  | Joao Silva  |
@@ -5,6 +5,7 @@ Feature: search products
  
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And feature "disable_asset_products" is disabled on environment
     And the following enterprises
       | identifier  | name    |
@@ -13,6 +13,6 @@ Given /^the following categories as facets$/ do |table|
     ids << cat.id
   end
   env = Environment.default
-  env.top_level_category_as_facet_ids = ids
+  env.solr_plugin_top_level_category_as_facet_ids = ids
   env.save!
 end
@@ -0,0 +1,14 @@
+raise "Not ready yet. Some tests are failing."
+require 'rubygems'
+require 'rake'
+
+tasks_dir = File.join(File.dirname(__FILE__), 'vendor', 'plugins', 'acts_as_solr_reloaded', 'lib', 'tasks', '*.rake')
+
+Dir[tasks_dir].each do |file|
+  load file
+end
+
+begin
+  Rake::Task['solr:download'].invoke
+rescue Exception => exception
+end
@@ -6,8 +6,6 @@ class SolrPlugin &lt; Noosfero::Plugin
  
   include SolrPlugin::SearchHelper
  
-  delegate :params, :current_user, :to => :context
-
   def self.plugin_name
     "Solr"
   end
@@ -28,11 +26,16 @@ class SolrPlugin &lt; Noosfero::Plugin
     return if empty_query?(query, category) && klass != Product
  
     solr_options = solr_options(class_asset(klass), category)
-    user = context.send(:logged_in?) ? context.send(:user) : nil
     solr_options.merge!(products_options(user)) if klass == Product && empty_query?(query, category)
     klass.find_by_contents(query, paginate_options, solr_options.merge(options))
   end
  
-end
+  def method_missing method, *args, &block
+    if self.context.respond_to? method
+      self.context.send method, *args, &block
+    else
+      super method, *args, &block
+    end
+  end
  
-Dir[File.join(SolrPlugin.root_path, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
+end
@@ -54,7 +54,7 @@ module SolrPlugin::SearchHelper
   end
  
   def results_only?
-    context.params[:action] == 'index'
+    params[:action] == 'index'
   end
  
   def empty_query?(query, category)
@@ -84,18 +84,18 @@ module SolrPlugin::SearchHelper
     solr_options = {}
     if !multiple_search?
       if !results_only? and asset_class.respond_to? :facets
-        solr_options.merge! asset_class.facets_find_options(context.params[:facet])
+        solr_options.merge! asset_class.facets_find_options(params[:facet])
         solr_options[:all_facets] = true
       end
       solr_options[:filter_queries] ||= []
       solr_options[:filter_queries] += filters(asset)
-      solr_options[:filter_queries] << "environment_id:#{context.environment.id}"
+      solr_options[:filter_queries] << "environment_id:#{environment.id}"
       solr_options[:filter_queries] << asset_class.facet_category_query.call(category) if category
  
       solr_options[:boost_functions] ||= []
-      context.params[:order_by] = nil if context.params[:order_by] == 'none'
-      if context.params[:order_by]
-        order = SortOptions[asset][context.params[:order_by].to_sym]
+      params[:order_by] = nil if params[:order_by] == 'none'
+      if params[:order_by]
+        order = SortOptions[asset][params[:order_by].to_sym]
         raise "Unknown order by" if order.nil?
         order[:solr_opts].each do |opt, value|
           solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
 .controller-search #search-column-right .search-field .formfield {
   width: 594px;
-  display: inline-block;
+  display: inline;
 }
  
 #search-column-right .search-customize-options {
-  position: absolute;
   margin: 0;
   padding: 5px 0;
-  bottom: 0;
-  left: 0;
 }
  
 #search-column-right .search-results-box .vcard {
...	...	@@ -44,6 +44,7 @@ Antonio Terceiro <terceiro@colivre.coop.br>
44	44	Aurelio A. Heckert <aurelio@colivre.coop.br>
45	45	Braulio Bhavamitra <brauliobo@gmail.com>
46	46	Bráulio Bhavamitra <brauliobo@gmail.com>
	47	+Braulio Bhavamitra <braulio@eita.org.br>
47	48	Caio <caio.csalgado@gmail.com>
48	49	Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
49	50	Caio Formiga <caio.formiga@gmail.com>
...	...	@@ -147,6 +148,7 @@ João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
147	148	João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
148	149	Joenio Costa <joenio@colivre.coop.br>
149	150	Josef Spillner <josef.spillner@tu-dresden.de>
	151	+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
150	152	Keilla Menezes <keilla@colivre.coop.br>
151	153	Larissa Reis <larissa@colivre.coop.br>
152	154	Larissa Reis <reiss.larissa@gmail.com>
...	...
...	...	@@ -6,10 +6,10 @@ class ManageProductsController < ApplicationController
6	6	before_filter :login_required, :except => [:show]
7	7	before_filter :create_product?, :only => [:new]
8	8
9		- protected
	9	+ protected
10	10
11	11	def check_environment_feature
12		- if profile.environment.enabled?('disable_products_for_enterprises')
	12	+ unless profile.environment.enabled?('products_for_enterprises')
13	13	render_not_found
14	14	return
15	15	end
...	...
...	...	@@ -38,7 +38,7 @@ class ProfileDesignController < BoxOrganizerController
38	38	end
39	39
40	40	# product block exclusive for enterprises in environments that permits it
41		- if profile.enterprise? && !profile.environment.enabled?('disable_products_for_enterprises')
	41	+ if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
42	42	blocks << ProductsBlock
43	43	end
44	44
...	...
...	...	@@ -12,7 +12,7 @@ class CatalogController < PublicController
12	12	protected
13	13
14	14	def check_enterprise_and_environment
15		- unless profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises')
	15	+ unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
16	16	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
17	17	end
18	18	end
...	...
...	...	@@ -99,9 +99,11 @@ module BoxesHelper
99	99	unless block.visible?
100	100	options[:title] = _("This block is invisible. Your visitors will not see it.")
101	101	end
	102	+
102	103	if @controller.send(:content_editor?)
103	104	result = filter_html(result, block)
104	105	end
	106	+
105	107	box_decorator.block_target(block.box, block) +
106	108	content_tag('div',
107	109	content_tag('div',
...	...
...	...	@@ -28,7 +28,7 @@ module CmsHelper
28	28	end
29	29
30	30	def link_to_article(article)
31		- article_name = short_filename(article.title, 30)
	31	+ article_name = article.title
32	32	if article.folder?
33	33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
34	34	else
...	...
...	...	@@ -136,7 +136,7 @@ module ProfileEditorHelper
136	136	concat(
137	137	content_tag(
138	138	'div',
139		- capture(&block) + content_tag('br', '', :style => 'clear: left'),
	139	+ capture(&block) + tag('br', :style => 'clear: left'),
140	140	:class => 'control-panel')
141	141	)
142	142	end
...	...
1	1	module ProfileHelper
2	2
3	3	def display_field(title, profile, field, force = false)
4		- if (!force && !profile.active_fields.include?(field.to_s)) \|\|
5		- (profile.active_fields.include?(field.to_s) && !profile.public_fields.include?(field.to_s) && (!user \|\| (user != profile && !user.is_a_friend?(profile))))
	4	+ unless force \|\| profile.may_display_field_to?(field, user)
6	5	return ''
7	6	end
8	7	value = profile.send(field)
...	...
...	...	@@ -3,7 +3,7 @@ class ActionTrackerNotification < ActiveRecord::Base
3	3	belongs_to :profile
4	4	belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
5	5
6		- has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
	6	+ delegate :comments, :to => :action_tracker, :allow_nil => true
7	7
8	8	validates_presence_of :profile_id, :action_tracker_id
9	9	validates_uniqueness_of :action_tracker_id, :scope => :profile_id
...	...
...	...	@@ -57,7 +57,7 @@ class Article < ActiveRecord::Base
57	57	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
58	58	has_many :categories, :through => :article_categorizations
59	59
60		- has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy
	60	+ has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
61	61	has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
62	62
63	63	acts_as_having_settings :field => :setting
...	...