Improve message threads (by @paroga)

This commit is contained in:
wvengen 2016-03-04 17:24:28 +01:00
parent 673448a5ac
commit 6b32d0c960
13 changed files with 89 additions and 27 deletions

View file

@ -3,10 +3,11 @@ class MessageThreadsController < ApplicationController
before_filter -> { require_plugin_enabled FoodsoftMessages }
def index
@message_threads = Message.pub.threads.page(params[:page]).per(@per_page).order(created_at: :desc).includes(:sender)
@groups = Group.order(:name)
end
def show
@messages = Message.thread(params[:id]).order(:created_at)
@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)
end
end

View file

@ -47,4 +47,8 @@ class MessagesController < ApplicationController
redirect_to messages_url, alert: 'Nachricht ist privat!'
end
end
def thread
@messages = Message.thread(params[:id]).order(:created_at)
end
end