Show private messages in foodsofts index pages (fixes #106)
This commit is contained in:
parent
f8148e7d30
commit
722bb474d1
7 changed files with 10 additions and 8 deletions
|
|
@ -8,6 +8,6 @@ class MessageThreadsController < ApplicationController
|
|||
|
||||
def show
|
||||
@group = Group.find_by_id(params[:id])
|
||||
@message_threads = Message.pub.threads.where(group: @group).page(params[:page]).per(@per_page).order(created_at: :desc)
|
||||
@message_threads = Message.readable_for(current_user).threads.where(group: @group).page(params[:page]).per(@per_page).order(created_at: :desc)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ class MessagesController < ApplicationController
|
|||
|
||||
# Renders the "inbox" action.
|
||||
def index
|
||||
@messages = Message.pub.page(params[:page]).per(@per_page).order('created_at DESC').includes(:sender)
|
||||
@messages = Message.readable_for(current_user).page(params[:page]).per(@per_page).order('created_at DESC').includes(:sender)
|
||||
end
|
||||
|
||||
# Creates a new message object.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue