projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05514ce
)
Avoid multiple returns
author
Tom Hughes
<tom@compton.nu>
Wed, 29 Aug 2018 07:47:02 +0000
(08:47 +0100)
committer
Tom Hughes
<tom@compton.nu>
Wed, 29 Aug 2018 07:53:23 +0000
(08:53 +0100)
app/controllers/messages_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/messages_controller.rb
b/app/controllers/messages_controller.rb
index 6af860671d1190bdec8c06e6996b4c84bc21b6a9..54850d403de9feb035ce5b5a91ec5d611c9f0cd8 100644
(file)
--- a/
app/controllers/messages_controller.rb
+++ b/
app/controllers/messages_controller.rb
@@
-26,13
+26,14
@@
class MessagesController < ApplicationController
if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
flash[:error] = t ".limit_exceeded"
+ render :action => "new"
elsif @message.save
flash[:notice] = t ".message_sent"
Notifier.message_notification(@message).deliver_now
redirect_to :action => :inbox
- return
+ else
+ render :action => "new"
end
- render :action => "new"
end
# Allow the user to reply to another message.