comments on profile page fixed

fixes publiclab#2196
ViditChitkara · Feb 2, 2018 · 9240091 · 9240091
1 parent d3391d5
commit 9240091
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -5,8 +5,8 @@ class Comment < ActiveRecord::Base
     :subject, :hostname, :comment,
     :status, :format, :thread, :timestamp
 
-  belongs_to :node, foreign_key: 'nid', touch: true,
-                    dependent: :destroy, counter_cache: true
+  belongs_to :node, foreign_key: 'nid', touch: true, counter_cache: true
+                    # dependent: :destroy, counter_cache: true
   belongs_to :drupal_user, foreign_key: 'uid'
   belongs_to :answer, foreign_key: 'aid'
 
@@ -67,7 +67,7 @@ def parent
     if aid == 0
       node
     else
-      answer.node
+      answer && answer.node
     end
   end
 

diff --git a/app/models/node.rb b/app/models/node.rb
@@ -38,7 +38,7 @@ def updated_month
   has_many :tag, through: :node_tag
   # these override the above... have to do it manually:
   # has_many :tag, :through => :drupal_node_tag
-  has_many :comments, foreign_key: 'nid' #, dependent: :destroy # re-enable in Rails 5
+  has_many :comments, foreign_key: 'nid' , dependent: :destroy # re-enable in Rails 5
   has_many :drupal_content_type_map, foreign_key: 'nid' #, dependent: :destroy # re-enable in Rails 5
   has_many :drupal_content_field_mappers, foreign_key: 'nid' #, dependent: :destroy # re-enable in Rails 5
   has_many :drupal_content_field_map_editor, foreign_key: 'nid' #, dependent: :destroy # re-enable in Rails 5