summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMrYummy <elemental428@gmail.com>2017-06-15 15:04:15 +0200
committerMrYummy <elemental428@gmail.com>2017-06-15 15:04:15 +0200
commitdd193e740ad86c9841ed55f54b85fe91ee5da05a (patch)
tree35465ce3411e5ab643783c74bd4e617068b736be /app
parent9b50ec652cd8f80a16bd82987bd9f8eba389a2eb (diff)
Added 'read' check; message name is only bold if unread
Diffstat (limited to 'app')
-rw-r--r--app/controllers/messagereplies_controller.rb2
-rw-r--r--app/controllers/messages_controller.rb1
-rw-r--r--app/views/messages/index.html.erb2
-rw-r--r--app/views/users/show.html.erb2
4 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/messagereplies_controller.rb b/app/controllers/messagereplies_controller.rb
index e01501b..c8272eb 100644
--- a/app/controllers/messagereplies_controller.rb
+++ b/app/controllers/messagereplies_controller.rb
@@ -16,7 +16,7 @@ class MessagerepliesController < ApplicationController
@reply.user_author = current_user
@reply.message = message
if @reply.save
- @reply.message.update_attributes(user_hidden: nil)
+ @reply.message.update_attributes(user_hidden: nil, read: false)
if false
@reply.send_new_message_reply_mail
end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8f618d3..2f7357f 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -17,6 +17,7 @@ class MessagesController < ApplicationController
end
def show
+ Message.find(@message.id).update_attributes(read: true) if !@message.read && @message.user_target.is?(current_user)
@replies = @message.replies.page(params[:page])
end
diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
index de78f9b..8ff289d 100644
--- a/app/views/messages/index.html.erb
+++ b/app/views/messages/index.html.erb
@@ -26,7 +26,7 @@
<%= render partial: "users/username", locals: { user: user } %>
<span style="font-size:16px">
&nbsp;
- <b><%= link_to message.subject, message %></b>
+ <span class="<%= "bold" unless message.user_sender.is?(current_user) || message.read%>"><%= link_to message.subject, message %></span>
&nbsp; | &nbsp;
</span>
<%= ago message.created_at %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a48eae2..e2e9348 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -11,7 +11,7 @@
<%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %>
<% end %>
<% if @user.is?(current_user) %>
- <%= link_to "Private Messages (#{Message.where("user_sender_id = ? OR user_target_id = ?", current_user.id, current_user.id).count})", messages_path, :class => "btn blue" %>
+ <%= link_to "Private Messages (#{Message.where(read: false).count})", messages_path, :class => "btn blue" %>
<% elsif current_user %>
<%= link_to "Send this user a message", new_message_path(user_target: @user.ign), :class => "btn blue" %>
<% end %>