diff --git a/app/helpers/api_index_helper.rb b/app/helpers/api_index_helper.rb index 2010f99a..da6b25c5 100644 --- a/app/helpers/api_index_helper.rb +++ b/app/helpers/api_index_helper.rb @@ -132,7 +132,7 @@ module ApiIndexHelper def set_children_sections(objects,is_detail) children_sections_array = [] objects.find_each do |sec| - image = sec.attachments&.last + image = sec.image_attachment s_section = { id: sec.id, title: sec.title diff --git a/app/models/concerns/watchable.rb b/app/models/concerns/watchable.rb index 7d45d6ef..5d996b1f 100644 --- a/app/models/concerns/watchable.rb +++ b/app/models/concerns/watchable.rb @@ -13,7 +13,8 @@ module Watchable end def watched_by?(user) - !!(user && self.watcher_user_ids && self.watcher_user_ids.detect {|uid| uid == user.id }) + watcher_users.exists?(id: user.id) + # !!(user && self.watcher_user_ids && self.watcher_user_ids.detect {|uid| uid == user.id }) end def watch!(watchable) diff --git a/app/services/memos_service.rb b/app/services/memos_service.rb index 59322237..df400dc2 100644 --- a/app/services/memos_service.rb +++ b/app/services/memos_service.rb @@ -477,9 +477,9 @@ class MemosService set_msg = "您没有权限" end - memos = Memo.field_for_list.includes(:praise_tread, :author).where(:root_id => nil).order("sticky=1 desc, #{s_order} desc").limit(15) - memo_list = memo_data memos - {status: set_status, message: set_msg, memo_list: memo_list} + # memos = Memo.field_for_list.includes(:praise_tread, :author, :forums).where(:root_id => nil).order("sticky=1 desc, #{s_order} desc").limit(15) + # memo_list = memo_data memos + {status: set_status, message: set_msg} end diff --git a/db/migrate/20201014080839_add_watchers_count_to_memos.rb b/db/migrate/20201014080839_add_watchers_count_to_memos.rb new file mode 100644 index 00000000..1bf0f6d0 --- /dev/null +++ b/db/migrate/20201014080839_add_watchers_count_to_memos.rb @@ -0,0 +1,5 @@ +class AddWatchersCountToMemos < ActiveRecord::Migration[5.2] + def change + add_column :memos, :watchers_count, :integer, default: 0 + end +end