diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 7c05c5af5..193b2b61d 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -73,10 +73,10 @@ class WordsController < ApplicationController end def destroy - if User.current.admin? || User.current.id == @user.id - JournalsForMessage.delete_message(params[:object_id]) + if User.current.admin? || @user.id == User.current.id || User.current.id == JournalsForMessage.find(params[:object_id]).jour_id + @journal_destroyed = JournalsForMessage.delete_message(params[:object_id]) end - @jours = @user.journals_for_messages.reverse + @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse @limit = 10 @feedback_count = @jours.count @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index e00564f18..e83018be6 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -20,7 +20,6 @@ class JournalsForMessage < ActiveRecord::Base belongs_to :at_user, :class_name => "User", :foreign_key => 'reply_id' has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy - has_many :reply_for_journals, :dependent => :destroy validates :notes, presence: true after_create :act_as_activity #huang @@ -30,7 +29,8 @@ class JournalsForMessage < ActiveRecord::Base # default_scope { where('m_parent_id IS NULL') } def self.delete_message(message_id) - self.delete_all "id = #{message_id}" + self.find(message_id).destroy + # self.destroy_all "id = #{message_id}" end def reference_user diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index a909362d9..1249c9cb4 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,6 +1,6 @@ <% id = "journal_reply_ul_" + journal.id.to_s%> -