Fix merge with master

Victor Costa
1 parent 9c81f9f2
Showing 1 changed file with 36 additions and 4 deletions Show diff stats
app/models/article.rb
@@ -77,6 +77,10 @@ class Article &lt; ActiveRecord::Base
   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'
+  #Article followers relation
+  has_many :article_followers, :dependent => :destroy
+  has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
+
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
   has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
@@ -152,6 +156,8 @@ class Article &lt; ActiveRecord::Base
   validate :no_self_reference
   validate :no_cyclical_reference, :if => 'parent_id.present?'
+  validate :parent_archived?
+
   def no_self_reference
     errors.add(:parent_id, _('self-reference is not allowed.')) if id && parent_id == id
   end
@@ -486,6 +492,10 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def archived?
+    (self.parent && self.parent.archived) || self.archived
+  end
+
   def self.folder_types
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
@@ -632,13 +642,21 @@ class Article &lt; ActiveRecord::Base
   end
   def hit
-    self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
-    self.hits += 1
+    if !archived?
+      self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
+      self.hits += 1
+    end
   end
   def self.hit(articles)
-    Article.where(:id => articles.map(&:id)).update_all('hits = hits + 1')
-    articles.each { |a| a.hits += 1 }
+    ids = []
+    articles.each do |article|
+      if !article.archived?
+        ids << article.id
+        article.hits += 1
+      end
+    end
+    Article.where(:id => ids).update_all('hits = hits + 1') if !ids.empty?
   end
   def can_display_hits?
@@ -828,6 +846,14 @@ class Article &lt; ActiveRecord::Base
     true
   end
+  def view_page
+    "content_viewer/view_page"
+  end
+
+  def to_liquid
+    HashWithIndifferentAccess.new :name => name, :abstract => abstract, :body => body, :id => id, :parent_id => parent_id, :author => author
+  end
+
   private
   def sanitize_tag_list
@@ -844,4 +870,10 @@ class Article &lt; ActiveRecord::Base
     sanitizer.sanitize(text)
   end
+  def parent_archived?
+     if self.parent_id_changed? && self.parent && self.parent.archived?
+       errors.add(:parent_folder, N_('is archived!!'))
+     end
+  end
+
 end