Merge branch 'master' into admin-77

2015-08-08 13:00:41 +02:00
parent a949d54a85 90a3dcdc16
commit f8becd1b23
38 changed files with 628 additions and 92 deletions
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -17,4 +17,13 @@ class Comment < ActiveRecord::Base
  def self.find_parent(params)
    params[:commentable_type].constantize.find(params[:commentable_id])
  end
+
+  def debate
+    commentable if commentable.class == Debate
+  end
+
+  def author
+    user
+  end
+
 end