[#5289] Fix error when a journal with a question is destroyed by clea…

…ring the notes

lib/question_journal_hooks.rb

@@ -22,8 +22,10 @@ def controller_journals_edit_post(context = { })
     journal = context[:journal]
     params = context[:params]
 
+    # Handle destroying journals through the 'edit' action (done by clearing notes)
+    return '' if journal.destroyed?
+
     if params[:question] && params[:question][:assigned_to]
-
       if journal.question && params[:question][:assigned_to].blank?
         # Wants to remove the question
         journal.question.destroy

test/integration/question_plugin/hooks/question_journal_hooks_test.rb

@@ -132,6 +132,24 @@ def setup
       end
 
     end
+
+    context 'with a removed journal by clearing the notes' do
+      setup do
+        @question = Question.generate!(:issue => @issue, :journal => @journal, :assigned_to => @user2, :opened => true)
+
+        assert_difference('Journal.count',-1) do
+          assert_difference('Question.count', -1) do
+            post "/journals/edit/#{@journal.id}", :format => 'js', :notes => '', :question => { :assigned_to => ''}
+            assert_response :success
+          end
+        end
+      end
+
+      should 'should destroy the question' do
+        assert_equal nil, Question.find_by_id(@question.id)
+      end
+    end
+
   end
 
 end