From 896fe41db0b734bb73ade8f7b3909be03568cabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Thu, 20 Aug 2015 17:52:59 +0200
Subject: [PATCH] favors with_hidden

---
 app/models/comment.rb                | 2 +-
 app/models/debate.rb                 | 2 +-
 app/views/comments/_comment.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/comment.rb b/app/models/comment.rb
index e9f45edc3..0c298182d 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -9,7 +9,7 @@ class Comment < ActiveRecord::Base
   validates :user, presence: true
 
   belongs_to :commentable, polymorphic: true
-  belongs_to :user, -> { with_deleted }
+  belongs_to :user, -> { with_hidden }
 
   default_scope { includes(:user) }
   scope :recent, -> { order(id: :desc) }
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 6a411c346..4d9b4ffe8 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -11,7 +11,7 @@ class Debate < ActiveRecord::Base
   acts_as_taggable
   acts_as_paranoid column: :hidden_at
 
-  belongs_to :author, -> {with_deleted}, class_name: 'User', foreign_key: 'author_id'
+  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
 
   validates :title, presence: true
   validates :description, presence: true
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index eb6e1722d..ea6912094 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -70,7 +70,7 @@
     <% end %>
 
       <div class="comment-children">
-        <%= render comment.children.with_deleted.reorder('id DESC, lft') %>
+        <%= render comment.children.with_hidden.reorder('id DESC, lft') %>
       </div>
 
   </div>