Merge commit 'refs/merge-requests/227' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/227

Merge commit 'refs/merge-requests/227' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/227
Antonio Terceiro
2 parents 7fa67cbb fc679164
Showing 6 changed files with 25 additions and 8 deletions Show diff stats
app/helpers/search_helper.rb
app/models/product.rb
app/models/uploaded_file.rb
app/views/search/_image.rhtml
lib/acts_as_faceted.rb
test/unit/uploaded_file_test.rb
@@ -50,7 +50,7 @@ module SearchHelper
   end
   def map_search?
-    !@query.blank? and !multiple_search? and params[:display] == 'map'
+    !@empty_query and !multiple_search? and params[:display] == 'map'
   end
   def search_page_title(title, category = nil)
@@ -107,7 +107,7 @@ module SearchHelper
     @asset_class = asset_class(asset)
     render(:partial => 'facets_unselect_menu')
   end
-  
+
   def facet_javascript(input_id, facet, array)
     array = [] if array.nil?
     hintText = _('Type in an option')
@@ -156,6 +156,7 @@ module SearchHelper
     params = params.dup
     params[:facet].each do |id, value|
       facet = klass.facet_by_id(id.to_sym)
+      next unless facet
       if value.kind_of?(Hash)
         label_hash = facet[:label].call(environment)
         value.each do |label_id, value|
 class Product < ActiveRecord::Base
+
   belongs_to :enterprise
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -163,7 +164,7 @@ class Product &lt; ActiveRecord::Base
   def total_production_cost
     return inputs_cost if price_details.empty?
-    inputs_cost + price_details.map(&:price).inject { |sum,price| sum + price }
+    inputs_cost + price_details.map(&:price).inject(0){ |sum,price| sum + price }
   end
   def price_described?
@@ -67,7 +67,7 @@ class UploadedFile &lt; Article
       'upload-file'
     end
   end
-  
+
   def mime_type
     content_type
   end
@@ -129,6 +129,12 @@ class UploadedFile &lt; Article
     end
   end
+  def extension
+    dotindex = self.filename.rindex('.')
+    return nil unless dotindex
+    self.filename[(dotindex+1)..-1].downcase
+  end
+
   def allow_children?
     false
   end
@@ -144,4 +150,5 @@ class UploadedFile &lt; Article
   def uploaded_file?
     true
   end
+
 end
 <div class="search-image-container">
   <% if image.is_a? UploadedFile and image.filename %>
-    <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>
+    <% extension = image.extension %>
     <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
       <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
       <% if image.width && image.height %>
@@ -8,7 +8,7 @@ module ActsAsFaceted
     #
     #acts_as_faceted :fields => {
     #  :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
-    #  :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"), 
+    #  :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
     #    '[NOW-1YEARS TO NOW/DAY]' => _("Last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("Last month"), '[NOW-7DAYS TO NOW/DAY]' => _("Last week"), '[NOW-1DAYS TO NOW/DAY]' => _("Last day")}},
     #  :f_profile_type => {:label => _('Author'), :proc => proc{|klass| f_profile_type_proc(klass)}},
     #  :f_category => {:label => _('Categories')}},
@@ -36,7 +36,7 @@ module ActsAsFaceted
       self.facets_order = options[:order] || self.facets.keys
       self.facets_results_containers = {:fields => 'facet_fields', :queries => 'facet_queries', :ranges => 'facet_ranges'}
       self.facets_option_for_solr = Hash[facets.select{ |id,data| ! data.has_key?(:queries) }].keys
-      self.facets_fields_for_solr = facets.map{ |id,data| {id => data[:type] || :facet} } 
+      self.facets_fields_for_solr = facets.map{ |id,data| {id => data[:type] || :facet} }
       self.solr_fields_names = facets.map{ |id,data| id.to_s + '_' + get_solr_field_type(data[:type] || :facet) }
       self.facet_category_query = options[:category_query]
@@ -67,6 +67,7 @@ module ActsAsFaceted
         raise 'Use map_facets_for before this method' if facet[:solr_field].nil?
         facets_data = {} if facets_data.blank? # could be empty array
         solr_facet = to_solr_fields_names[facet[:solr_field]]
+        unfiltered_facets_data ||= {}
         if facet[:queries]
           container = facets_data[facets_results_containers[:queries]]
@@ -158,13 +159,15 @@ module ActsAsFaceted
       end
       def facet_label(facet)
-        _ facet[:label]
+        return nil unless facet
+        _(facet[:label])
       end
       def facets_find_options(facets_selected = {}, options = {})
         browses = []
         facets_selected ||= {}
         facets_selected.map do |id, value|
+          next unless facets[id.to_sym]
           if value.kind_of?(Hash)
             value.map do |label_id, value|
               value.to_a.each do |value|
@@ -306,6 +306,11 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     uses_sqlite
   end
+  should 'return extension' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => @profile)
+    assert_equal 'png', file.extension
+  end
+
   should 'upload to path prefix folder if database is not postgresql' do
     uses_sqlite
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => @profile)
1	<div class="search-image-container">	1	<div class="search-image-container">
2		2
3	<% if image.is_a? UploadedFile and image.filename %>	3	<% if image.is_a? UploadedFile and image.filename %>
4	- <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>	4	+ <% extension = image.extension %>
5	<% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>	5	<% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
6	<%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>	6	<%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
7	<% if image.width && image.height %>	7	<% if image.width && image.height %>