mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 06:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

rubocop lint

Browse Source
This commit is contained in:
Brenda Wallace
2019-08-07 22:33:39 +12:00
parent 83322becb2
commit 2f0e387646
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/conversations_controller.rb
View File

@@ -41,9 +41,9 @@ class ConversationsController < ApplicationController
def set_box
@boxes = {
'inbox' => { 'total' => mailbox.inbox.size, 'unread' => 0},
'sent' => { 'total' => mailbox.sentbox.size, 'unread' => 0},
'trash' => { 'total' => mailbox.trash.size, 'unread' => 0}
'inbox' => { 'total' => mailbox.inbox.size, 'unread' => 0 },
'sent' => { 'total' => mailbox.sentbox.size, 'unread' => 0 },
'trash' => { 'total' => mailbox.trash.size, 'unread' => 0 }
}
@box = if params[:box].blank? || !@boxes.keys.include?(params[:box])
'inbox'
@@ -55,7 +55,8 @@ class ConversationsController < ApplicationController
def check_current_subject_in_conversation
@conversation = Mailboxer::Conversation.find_by(id: params[:id])
return unless @conversation.nil? || !@conversation.is_participant?(current_member)
redirect_to conversations_path(box: box)
return
nil
end
end