Use type_name method for faceted search

Braulio Bhavamitra
1 parent cef870cc
Showing 17 changed files with 90 additions and 34 deletions Show diff stats
app/models/article.rb
app/models/blog.rb
app/models/community.rb
app/models/enterprise.rb
app/models/enterprise_homepage.rb
app/models/event.rb
app/models/folder.rb
app/models/forum.rb
app/models/gallery.rb
app/models/person.rb
app/models/profile.rb
app/models/raw_html_article.rb
app/models/rss_feed.rb
app/models/text_article.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
app/models/uploaded_file.rb
@@ -2,6 +2,12 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  # use for internationalizable human type names in search facets
+  # reimplement on subclasses
+  def self.type_name
+    _('Content')
+  end
+
   track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
   track_actions :update_article, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && (a.body_changed? || a.name_changed?) }, :custom_target => :action_tracker_target
   track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_target => :action_tracker_target
@@ -571,33 +577,10 @@ class Article &lt; ActiveRecord::Base
   private
-  def self.f_type_proc(klass)
-    klass.constantize 
-    h = {
-      'UploadedFile' => _("Uploaded File"), 
-      'TextArticle' => _("Text"),
-      'Folder' => _("Folder"),
-      'Event' => _("Event"),
-      'EnterpriseHomepage' => ("Homepage"),
-      'Gallery' => ("Gallery"),
-      'Blog' => ("Blog"),
-      'Forum' => ("Forum")
-    }
-    h[klass]
-  end
-  def self.f_profile_type_proc(klass)
-    h = {
-      'Enterprise' => _("Enterprise"), 
-      'Community' => _("Community"),
-      'Person' => ("Person"),
-      'BscPlugin::Bsc' => ("BSC")
-    }
-    h[klass]
-  end
-
   # FIXME: workaround for development env.
   # Subclasses aren't (re)loaded, and acts_as_solr
   # depends on subclasses method to search
+  # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
   UploadedFile
   TextArticle
   TinyMceArticle
@@ -609,20 +592,28 @@ class Article &lt; ActiveRecord::Base
   Forum
   Event
+  def self.f_type_proc(klass)
+    klass.constantize.type_name
+  end
+  def self.f_profile_type_proc(klass)
+    klass.constantize.type_name
+  end
+
   def f_type
-    case self.class.to_s
+    #join common types
+    case self.class.name
     when 'TinyMceArticle', 'TextileArticle'
-      'TextArticle'
+      TextArticle.name
     else
-      self.class.to_s
+      self.class.name
     end
   end
+  def f_profile_type
+    self.profile.class.name
+  end
   def f_published_at
     self.published_at
   end
-  def f_profile_type
-    self.profile.class.to_s
-  end
   def f_category
     self.categories.collect(&:name)
   end
@@ -9,6 +9,10 @@ class Blog &lt; Folder
   end
   alias_method_chain :posts, :no_folders
+  def self.type_name
+    _('Blog')
+  end
+
   def self.short_description
     _('Blog')
   end
 class Community < Organization
+
+  def self.type_name
+    _('Community')
+  end
+
   N_('Community')
   N_('Language')
@@ -2,6 +2,10 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  def self.type_name
+    _('Enterprise')
+  end
+
   N_('Enterprise')
   has_many :products, :dependent => :destroy, :order => 'name ASC'
 class EnterpriseHomepage < Article
+  def self.type_name
+    _('Homepage')
+  end
+
   def self.short_description
     __('Enterprise homepage.')
   end
 class Event < Article
+  def self.type_name
+    _('Event')
+  end
+
   settings_items :address, :type => :string
   def link=(value)
 class Folder < Article
+  def self.type_name
+    _('Folder')
+  end
+
   validate :not_belong_to_blog
   def not_belong_to_blog
@@ -2,6 +2,10 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
+  def self.type_name
+    _('Forum')
+  end
+
   def self.short_description
     _('Forum')
   end
 class Gallery < Folder
+  def self.type_name
+    _('Gallery')
+  end
+
   def self.short_description
     _('Gallery')
   end
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
+  def self.type_name
+    _('Person')
+  end
+
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
@@ -3,6 +3,12 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
+  # use for internationalizable human type names in search facets
+  # reimplement on subclasses
+  def self.type_name
+    _('Profile')
+  end
+
   module Roles
     def self.admin(env_id)
       find_role('admin', env_id)
@@ -843,10 +849,8 @@ private :generate_url, :url_options
   def f_type
     self.class.name
   end
-  def self.f_type_proc(id)
-    {'Enterprise' => _('Enterprise'),
-     'BscPlugin::Bsc' => _('BSC')
-    }[id]
+  def self.f_type_proc(klass)
+    klass.constantize.type_name
   end
   def name_sort
     name
 class RawHTMLArticle < TextArticle
+  def self.type_name
+    _('HTML')
+  end
+
   def self.short_description
     _('Raw HTML text article.')
   end
 class RssFeed < Article
+  def self.type_name
+    _('RssFeed')
+  end
+
   # i dont know why before filter dont work here
   def initialize(*args)
     super(*args)
@@ -3,6 +3,10 @@ class TextArticle &lt; Article
   xss_terminate :only => [ :name ], :on => 'validation'
+  def self.type_name
+    _('Article')
+  end
+
   include Noosfero::TranslatableContent
   def self.icon_name(article = nil)
 class TextileArticle < TextArticle
+  def self.type_name
+    _('Article')
+  end
+
   def self.short_description
     _('Text article with Textile markup language')
   end
 class TinyMceArticle < TextArticle
+  def self.type_name
+    _('Article')
+  end
+
   def self.short_description
     _('Text article with visual editor.')
   end
@@ -4,6 +4,10 @@
 # of the file itself is kept. (FIXME?)
 class UploadedFile < Article
+  def self.type_name
+    _('File')
+  end
+
   track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }
   include ShortFilename
1	class Community < Organization	1	class Community < Organization
		2	+
		3	+ def self.type_name
		4	+ _('Community')
		5	+ end
		6	+
2	N_('Community')	7	N_('Community')
3	N_('Language')	8	N_('Language')
4		9
1	class Event < Article	1	class Event < Article
2		2
		3	+ def self.type_name
		4	+ _('Event')
		5	+ end
		6	+
3	settings_items :address, :type => :string	7	settings_items :address, :type => :string
4		8
5	def link=(value)	9	def link=(value)
1	class Folder < Article	1	class Folder < Article
2		2
		3	+ def self.type_name
		4	+ _('Folder')
		5	+ end
		6	+
3	validate :not_belong_to_blog	7	validate :not_belong_to_blog
4		8
5	def not_belong_to_blog	9	def not_belong_to_blog