个人主页部分优化

app/controllers/users_controller.rb

@@ -1994,7 +1994,9 @@ end
       # 自己的主页显示消息
       # 系统消息为管理员发送，我的消息中包含有系统消息
       @message_alls = []
+      @system_messages
       messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" , @user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
+
       messages.each do |message_all|
         mess = message_all.message
         unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)

app/models/message_all.rb

@@ -1,5 +1,6 @@
 class MessageAll < ActiveRecord::Base
   attr_accessible :message_id, :message_type, :user_id
+  belongs_to :user
   # 虚拟关联---项目消息表/课程消息表/用户留言消息表/贴吧消息表
   belongs_to :message ,:polymorphic => true
 end

app/views/layouts/_logined_header.html.erb

@@ -99,8 +99,9 @@
 
   <div class="navHomepageNews" id="user_messages">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target => "_Blank", :title => "您的所有消息" %>
-    <% if User.current.count_new_message.to_i > 0 %>
-        <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target => "_Blank" %></div>
+    <% new_message_count = User.current.count_new_message.to_i %>
+    <% if new_message_count > 0 %>
+        <div ><%= link_to new_message_count, user_message_path(User.current), :class => "newsActive", :target => "_Blank" %></div>
     <% end %>
     <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
     <div class="shadowbox_news undis" id="user_messages_list">

app/views/users/_new_user_message.html.erb

@@ -1,29 +1,47 @@
 <% message_alls.each do |ma| %>
     <%# 系统消息 %>
+    <% if ma.class == SystemMessage && many_days_ago(ma.created_at, 30) %>
         <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+    <% end %>
 
+    <% if ma.class == AtMessage && ma.at_valid? && ma.at_message %>
         <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+    <% end %>
 
     <%# 课程消息 %>
+    <% if ma.class == CourseMessage %>
         <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+    <% end %>
 
     <!--项目消息-->
+    <% if ma.class == ForgeMessage %>
         <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
+    <% end %>
 
     <%# 竞赛消息 %>
+    <% if ma.class == ContestMessage %>
         <%= render :partial => 'users/user_message_contest', :locals => {:ma => ma}  %>
+    <% end %>
 
     <!--公共贴吧-->
+    <% if ma.class == MemoMessage %>
         <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
+    <% end %>
 
     <!--用户留言-->
+    <% if ma.class == UserFeedbackMessage %>
         <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
+    <% end %>
 
+    <% if ma.class == OrgMessage %>
         <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
+    <% end %>
     
     <%# 申请类消息 %>
+    <% if ma.class == AppliedMessage %>
         <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
     <% end %>
+<% end %>
 
 <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>

app/views/users/_user_at_message.html.erb

@@ -1,4 +1,4 @@
-<% if ma.class == AtMessage && ma.at_valid? && ma.at_message %>
+
 <ul class="homepageNewsList fl">
   <div class="longMessageWidth">
     <li class="homepageNewsPortrait fl">
@@ -31,4 +31,3 @@
   </div>
   <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
 </ul>
-<% end %>

app/views/users/_user_message_applied.html.erb

@@ -1,4 +1,3 @@
-<% if ma.class == AppliedMessage %>
 <!-- 申请添加单位 -->
 <% if ma.applied_type == "ApplyAddSchools" %>
     <ul class="homepageNewsList fl">
@@ -51,4 +50,3 @@
       <%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
     </ul>
 <% end %>
-<% end %>

app/views/users/_user_message_contest.html.erb

@@ -1,4 +1,4 @@
-<% if ma.class == ContestMessage %>
+
   <% if ma.contest_message_type == "ContestRequestDealResult" %>
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
@@ -298,4 +298,3 @@
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-<% end %>

app/views/users/_user_message_course.html.erb

@@ -1,4 +1,3 @@
-<% if ma.class == CourseMessage %>
 <% if ma.course_message_type == "News" && ma.course_message %>
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
@@ -922,4 +921,3 @@
       <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
     </ul>
 <% end %>
-<% end %>

app/views/users/_user_message_forge.html.erb

@@ -1,6 +1,5 @@
-<% if ma.class == ForgeMessage %>
-    <!--申请加入项目-->
 <% if ma.forge_message_type == "AppliedProject" %>
+    <%#= 这类数据其实已经不要了 %>
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
         <li class="homepageNewsPortrait fl">
@@ -237,4 +236,3 @@
       <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
     </ul>
 <% end %>
-<% end %>

app/views/users/_user_message_forum.html.erb

@@ -1,4 +1,4 @@
-<% if ma.class == MemoMessage %>
+
     <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
         <ul class="homepageNewsList fl">
           <div class="longMessageWidth">
@@ -26,4 +26,3 @@
           <li class="homepageNewsTime fr"><%= time_tag(ma.memo.created_at).html_safe %> </li>
         </ul>
     <% end %>
-<% end %>

app/views/users/_user_message_org.html.erb

@@ -1,4 +1,4 @@
-<% if ma.class == OrgMessage %>
+
 <% if ma.message_type == 'ApplySubdomain'%>
     <ul class="homepageNewsList fl">
       <div class="shortMessageWidth">
@@ -41,4 +41,3 @@
       <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
     </ul>
 <% end %>
-<% end %>

app/views/users/_user_message_system.html.erb

@@ -1,5 +1,3 @@
-<% if ma.class == SystemMessage && many_days_ago(ma.created_at, 30) %>
-    <%# @user_system_messages.each do |usm| %>
 <ul class="homepageNewsList fl">
   <div class="longMessageWidth">
     <li class="homepageNewsPortrait fl">
@@ -7,16 +5,12 @@
     </li>
     <li class="homepageNewsPubType fl">
       <span style="color: red;float: left">系统消息：</span>
-          <!--            <span class="homepageNewsType fl">发布新消息：</span>-->
     </li>
     <li class="messageInformationContents">
       <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current, :anchor => "position_#{ma.id}"),
                   :id => "content_link_#{ma.id}", :target => '_blank' %>
-          <!--:onmouseover =>"message_titile_show($(this),event);",-->
-          <!--:onmouseout => "message_titile_hide($(this));"-->
     </li>
   </div>
   <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
 </ul>
-    <%# end %>
-<% end %>
+

app/views/users/_user_message_userfeedaback.html.erb

@@ -1,4 +1,4 @@
-<% if ma.class == UserFeedbackMessage %>
+
 <% if ma.journals_for_message_type == "JournalsForMessage" %>
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
@@ -33,4 +33,3 @@
       <li class="homepageNewsTime fr"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
     </ul>
 <% end %>
-<% end %>