From 155dff7e27a7d8039d45f85ea899db953b4d3799 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 12 Oct 2015 15:08:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AF=B9=E5=BA=94=E7=9A=84=E5=9B=BE=E6=A0=87=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- .../users/_selector_for_messages.html.erb | 46 ++++++++++-------- public/images/homepage_icon.png | Bin 11972 -> 16534 bytes public/stylesheets/new_user.css | 9 ++++ 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 055c59f06..c4a46abc1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -121,7 +121,7 @@ class UsersController < ApplicationController messages = MessageAll.where("user_id =?", @user).order("created_at desc") messages.each do |message_all| # 在点击或者刷新消息列表后未读的消息存放在数组 - if message_all.message_type != "SystemMessage" && message_all.message.viewed == 0 + if message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0 @message_alls << message_all.message end end diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb index 0bffdca2b..e7884fc60 100644 --- a/app/views/users/_selector_for_messages.html.erb +++ b/app/views/users/_selector_for_messages.html.erb @@ -2,35 +2,39 @@
<%= title_for_message(params[:type]) %>