私信添加提醒

app/controllers/private_messages_controller.rb

@@ -11,7 +11,7 @@ class PrivateMessagesController < ApplicationController
       User.current.onclick_time.update_attribute(:onclick_time, Time.now)
       jours = PrivateMessage.find_by_sql("SELECT ui.* FROM (SELECT * FROM private_messages WHERE STATUS != 2 AND user_id = #{@user.id} ORDER BY id DESC) ui GROUP BY ui.target_id ORDER BY ui.send_time DESC")
 
-      @unred_all_messages = 0
+      @unred_all_messages = @user.count_new_message("all")
       @unred_private_messages = @user.unread_private_messages
       # jours = PrivateMessage.without_deleted.where("user_id = ?", @user.id).order("created_at desc")
       @limit = 20
@@ -79,7 +79,7 @@ class PrivateMessagesController < ApplicationController
 
   def private_messages_detail
     if User.current == @user || User.current.admin?
-      @unred_private_messages = 0
+      @unred_private_messages = @user.unread_private_messages
       @unred_all_messages = 0
       @target_user = User.where(:id => params[:target_ids]).includes(:user_extensions).first
       if @target_user.present?

app/controllers/users_controller.rb

@@ -477,13 +477,20 @@ class UsersController < ApplicationController
     messages.each do |message_all|
       # 未读的消息存放在数组
       mess = message_all.message
-      if mess.created_at > onclick_time
-        unless message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1
+      if (message_all.message_type != "SystemMessage" && !mess.nil? && (mess.viewed == 0 || !mess.viewed) && mess.created_at > onclick_time) || (message_all.message_type == "SystemMessage"&& !mess.nil? && mess.created_at > onclick_time)
+        unless (message_all.message_type == 'CourseMessage') && mess && mess.course  && (mess.course.is_delete == 1)
           @message_alls << mess
         end
         break if @message_alls.length == 10
       end
     end
+
+    #未读私信
+    unred_private_messages = User.current.private_messages.where(status: 0)
+    unred_private_messages.each do |message|
+      @message_alls << message
+      break if @message_alls.length == 10
+    end
   end
 
   # 用户消息
@@ -517,7 +524,9 @@ class UsersController < ApplicationController
         @message_alls = user_all_messages.where(message_type: %w(SystemMessage ContestMessage OrgMessage))
     end
     @unred_all_messages = @user.count_new_message(@msg_type)
-    @unred_private_messages = 0
+    # @unred_private_messages = 0
+    @unred_private_messages = @user.unread_private_messages
+
     @message_alls = @message_alls.order("created_at desc")
 
     #点击进入tab后，全部更新为已读，全部页面除外

app/models/user.rb

@@ -496,6 +496,9 @@ class User < Principal
     blog_messages = BlogMessage.where("user_id=? and viewed=? and created_at >?", user.id, 0, onclick_time)
     blog_message_count = blog_messages.count
 
+    user_private_messages = PrivateMessage.where("user_id=? and status=?",user.id, 0)
+    private_messages_count = user_private_messages.size
+
     if type != "all"
       Rails.logger.info("######________type__________##########{type}")
       message_new_time.update_attribute(:onclick_time, Time.now)
@@ -509,7 +512,7 @@ class User < Principal
       blog_messages.update_all(:viewed => true) unless blog_messages.nil?
       applied_messages.update_all(:viewed => true) unless applied_messages.nil?
     end
-    messages_count = course_count + contest_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count + applied_count + blog_message_count
+    messages_count = course_count + contest_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count + applied_count + blog_message_count + private_messages_count
   end
 
   #未读私信数量

app/views/layouts/_logined_header.html.erb

@@ -87,7 +87,7 @@
 
   <div class="navHomepageNews" id="user_messages">
     <a href="<%= user_message_path(User.current,click_user_message: true) %>" class="fl"><i class="iconfont icon-xiaoxilingdang fontGrey4 f22 fl mt7"></i></a>
-    <% new_message_count = User.current.count_new_message(nil).to_i %>
+    <% new_message_count = User.current.count_new_message("all").to_i %>
     <% if new_message_count > 0 %>
           <%#= link_to new_message_count, user_path(User.current, :click_user_message => true), :class => "newsActive", :target => "_Blank" %>
           <span class="haveNews"></span>

app/views/layouts/_show_messages_list.html.erb

@@ -243,7 +243,10 @@
         <% content = '<span class="shadowbox_news_user">'+ma.author.show_name+' </span>提到了你：'+ma.subject.html_safe %>
         <li><%=link_to content.html_safe, ma.url, :title => ma.author.show_name+' 提到了你：'+ma.subject.html_safe, :target => '_blank' %></li>
       <% end %>
-    <% end %>
+      <% elsif ma.class == PrivateMessage %>
+      <li><a href="<%=private_messages_detail_user_private_messages_path(current_user, target_ids: ma.target_id) %>" target="_blank" ><span class="shadowbox_news_user"><%= ma.target.try(:show_name) %> </span>给您发了私信：<%= ma.content%></a></li>
+
+<% end %>
   <% end %>
 </ul>
   <!--<a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>-->

app/views/private_messages/_user_new_feedbacks.html.erb

@@ -14,7 +14,7 @@
               <span class="color-grey-c mr20">[<%= (@user.get_user_contact_messages(jour.target_id) + 1) %>条]</span>
               <span class="color-grey-c"><%= time_from_now(jour.updated_at) %></span>
             </p>
-            <div class="color-grey-6 markdown-body mt10">
+            <div class="color-grey-6 markdown-body mt10 word_break">
               <%=  message_content(jour.content.html_safe) %>
             </div>
           </div>

public/stylesheets/css/structure.css

@@ -550,6 +550,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
 .flex-cell_homepage:hover{ background-color:#3b94d6;}
 /*私信*/
 .flex1{flex:1;}
+.word_break{word-break: break-all;}
 .private-item:last-child {
     border-bottom: none;
 }