From 66e80d034ffdf0cb504d41fc94dc3061fcc1a705 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Apr 2016 18:46:00 +0800
Subject: [PATCH] =?UTF-8?q?issue=E5=8F=AA=E5=8F=96=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/issue.rb   | 2 +-
 app/api/mobile/entities/journal.rb | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb
index 55923f468..bc2d92b1b 100644
--- a/app/api/mobile/entities/issue.rb
+++ b/app/api/mobile/entities/issue.rb
@@ -40,7 +40,7 @@ module Mobile
       issue_expose :journals_count
       expose :issue_journals, using: Mobile::Entities::Journal  do |f, opt|
         if f.is_a?(::Issue)
-          f.journals
+          f.journals.where("notes != null")
         end
       end
     end
diff --git a/app/api/mobile/entities/journal.rb b/app/api/mobile/entities/journal.rb
index a2c54248e..6eb254a6b 100644
--- a/app/api/mobile/entities/journal.rb
+++ b/app/api/mobile/entities/journal.rb
@@ -1,11 +1,14 @@
 module Mobile
 module Entities
   class Journal <Grape::Entity
+=begin
     include Redmine::I18n
     include ApplicationHelper
     include ApiHelper
+    include IssuesHelper
     include ActionView::Helpers::TagHelper
-    #include Erubis::ERB::Util
+    include ActionView::Helpers::UrlHelper
+=end
     def self.journal_expose(f)
       expose f do |journal, opt|
         if journal.is_a?(Hash) && journal.key?(f)
@@ -21,7 +24,7 @@ module Entities
             case f
               when :detail_journal
                 if journal.details.any?
-                  jdetails_to_strings(journal.details)
+                  details_to_strings(journal.details)
                 end
             end
           end
@@ -31,7 +34,7 @@ module Entities
 
     expose :notes
     journal_expose :created_on
-    journal_expose :detail_journal
+    #journal_expose :detail_journal
   end
 end
 end
\ No newline at end of file