From 9dc92fe817f934e66d40dcb64faded2ab82c2043 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 4 May 2016 16:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb         |  5 +-
 app/views/blogs/_article.html.erb           | 90 ++++++++++----------
 app/views/layouts/_user_courses.html.erb    |  4 +-
 app/views/layouts/_user_projects.html.erb   |  4 +-
 app/views/users/_course_boardlist.html.erb  | 94 +++++++++++----------
 app/views/users/_course_newslist.html.erb   | 62 +++++++-------
 app/views/users/_project_boardlist.html.erb | 94 +++++++++++----------
 app/views/users/_user_course_list.html.erb  | 72 ++++++++--------
 app/views/users/_user_project_list.html.erb | 50 ++++++-----
 9 files changed, 249 insertions(+), 226 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6cc94d5a7..54970add6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2858,8 +2858,7 @@ class UsersController < ApplicationController
     sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*").order("#{sort_name} #{sort_type}")
-
+    @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
     # @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a #{sort_type}")
 
     #根据 作业+资源数排序
@@ -2904,7 +2903,7 @@ class UsersController < ApplicationController
     sort_name = "updated_on"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @projects = @user.projects.visible.select("projects.*").order("#{sort_name} #{sort_type}")
+    @projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
     # @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}")
 
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index ea494d0f9..4c00ee8a2 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -16,51 +16,55 @@
         <div class="cl"></div>
       </div>
       <div class="bloglistbox">
-        <% topics.each do |activity| %>
-            <ul class="list-file">
-              <li><span class="item_list fl"></span>
-                <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                    <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl" %>
-                <% else %>
-                    <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%>
-                <% end %>
-                <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
-                    <span class="c_red ml10 fr">[已设为首页]</span>
-                <% end %>
-                <% if activity.sticky == 1 %>
-                    <span class="fl ml10 red-cir-btn">顶</span>
-                <% end%>
-                <% if activity.locked %>
-                    <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
-                <% end %>
-                <div class="cl"></div>
-              </li>
-              <% count=0 %>
-              <% if activity.parent %>
-                  <% count=activity.parent.children.count%>
-              <% else %>
-                  <% count=activity.children.count%>
-              <% end %>
-              <li class="ml15">
-                <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-                <span class="grayTxt">更新时间：<%= format_time(activity.updated_on) %></span>
-                <p class="list-info fr grayTxt">
-                    <span><%= count>0 ? "#{count}" :"0" %></span>
-                    <span>回复</span>
-                    <span>|</span>
-                    <span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" :"0" %></span>
-                    <span>赞</span>
-                </p>
-              </li>
+        <% if topics.any? %>
+            <% topics.each do |activity| %>
+                <ul class="list-file">
+                  <li><span class="item_list fl"></span>
+                    <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                        <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl" %>
+                    <% else %>
+                        <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%>
+                    <% end %>
+                    <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
+                        <span class="c_red ml10 fr">[已设为首页]</span>
+                    <% end %>
+                    <% if activity.sticky == 1 %>
+                        <span class="fl ml10 red-cir-btn">顶</span>
+                    <% end%>
+                    <% if activity.locked %>
+                        <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                    <% end %>
+                    <div class="cl"></div>
+                  </li>
+                  <% count=0 %>
+                  <% if activity.parent %>
+                      <% count=activity.parent.children.count%>
+                  <% else %>
+                      <% count=activity.children.count%>
+                  <% end %>
+                  <li class="ml15">
+                    <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+                    <span class="grayTxt">更新时间：<%= format_time(activity.updated_on) %></span>
+                    <p class="list-info fr grayTxt">
+                        <span><%= count>0 ? "#{count}" :"0" %></span>
+                        <span>回复</span>
+                        <span>|</span>
+                        <span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" :"0" %></span>
+                        <span>赞</span>
+                    </p>
+                  </li>
+                  <div class="cl"></div>
+                </ul>
+            <% end %>
+            <div>
+              <ul class="wlist" id="pages" >
+                <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+              </ul>
               <div class="cl"></div>
-            </ul>
+            </div>
+        <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
         <% end %>
-        <div>
-          <ul class="wlist" id="pages" >
-            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-          </ul>
-          <div class="cl"></div>
-        </div>
       </div>
     </div>
 </div>
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index e740fe43d..07eb70f0f 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -75,10 +75,10 @@
 <% end%>
 
 <script type="text/javascript">
-    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).select("courses.* FROM `course_activities` WHERE course_activities.course_id = courses.id) ").count %>;
+    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).count %>;
     var courseshowcount = document.getElementsByClassName("coursesLineGrey").length;
 
-    if((coursecount == courseshowcount)&&(coursecount > 5) ){
+    if((coursecount <= courseshowcount)&&(coursecount > 5) ){
         $("#user_show_more_course").hide();
         $('#user_hide_course').show();
     }
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index 0f9c9b3da..78896cf7f 100644
--- a/app/views/layouts/_user_projects.html.erb
+++ b/app/views/layouts/_user_projects.html.erb
@@ -56,10 +56,10 @@
 <% end%>
 
 <script type="text/javascript">
-    var projectcount = <%= @user.projects.visible.select("projects.* FROM `forge_activities` WHERE forge_activities.project_id = projects.id) ").count %>;
+    var projectcount = <%= @user.projects.visible.count %>;
     var projectshowcount = document.getElementsByClassName("projectsLineGrey").length;
 
-    if((projectcount == projectshowcount)&&(projectcount > 5)){
+    if((projectcount <= projectshowcount)&&(projectcount > 5)){
         $("#user_show_more_project").hide();
         $('#user_hide_project').show();
     }
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index d41d630ce..ce5881a4a 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -15,54 +15,58 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% topics.each do |activity| %>
-          <div class="list-file">
-            <div><span class="item_list fl"></span>
-              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                  <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
-              <% else %>
-                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
-              <% end %>
-              <% if activity.sticky == 1 %>
-                  <span class="fl ml10 red-cir-btn">顶</span>
-              <% end%>
-              <% if activity.locked %>
-                  <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
-              <% end %>
-              <% u = User.where("id=?",activity.author_id).first%>
-              <span class="fr grayTxt">
-                  发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-              </span>
-              <div class="cl"></div>
-            </div>
-            <div class="massages-content ml15">
-              <% if activity.parent_id.nil? %>
-                  <% content = activity.content %>
-              <% else %>
-                  <% content = activity.parent.content %>
-              <% end %>
-              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54} %></p>
-            </div>
-            <div class="ml15 mt10">
-              <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-              <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
-              <% count=0 %>
-              <% if activity.parent %>
-                  <% count=activity.parent.children.count%>
-              <% else %>
-                  <% count=activity.children.count%>
-              <% end %>
-              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
-            </div>
+      <% if topics.any? %>
+          <% topics.each do |activity| %>
+              <div class="list-file">
+                <div><span class="item_list fl"></span>
+                  <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                      <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+                  <% else %>
+                      <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+                  <% end %>
+                  <% if activity.sticky == 1 %>
+                      <span class="fl ml10 red-cir-btn">顶</span>
+                  <% end%>
+                  <% if activity.locked %>
+                      <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                  <% end %>
+                  <% u = User.where("id=?",activity.author_id).first%>
+                  <span class="fr grayTxt">
+                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <div class="massages-content ml15">
+                  <% if activity.parent_id.nil? %>
+                      <% content = activity.content %>
+                  <% else %>
+                      <% content = activity.parent.content %>
+                  <% end %>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54} %></p>
+                </div>
+                <div class="ml15 mt10">
+                  <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <% count=0 %>
+                  <% if activity.parent %>
+                      <% count=activity.parent.children.count%>
+                  <% else %>
+                      <% count=activity.children.count%>
+                  <% end %>
+                  <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <div>
+            <ul class="wlist" id="pages" >
+              <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+            </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
       <% end %>
-      <div>
-        <ul class="wlist" id="pages" >
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index 5df06b16f..ca782b0d5 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -15,38 +15,42 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% topics.each do |activity| %>
-          <div class="list-file">
-            <div><span class="item_list fl"></span>
-              <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
-              <% if activity.sticky == 1 %>
-                  <span class="fl ml10 red-cir-btn">顶</span>
-              <% end%>
-              <% u = User.where("id=?",activity.author_id).first%>
-              <span class="fr grayTxt">
-                  发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-              </span>
-              <div class="cl"></div>
-            </div>
-            <div class="massages-content ml15">
-              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54} %></p>
-            </div>
-            <div class="ml15 mt10">
-              <span class="grayTxt">发布时间：<%= format_time(activity.created_on) %></span>
-              <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
-              <% count=0 %>
-              <% count=activity.comments.count %>
-              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
-            </div>
+      <% if topics.any? %>
+          <% topics.each do |activity| %>
+              <div class="list-file">
+                <div><span class="item_list fl"></span>
+                  <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
+                  <% if activity.sticky == 1 %>
+                      <span class="fl ml10 red-cir-btn">顶</span>
+                  <% end%>
+                  <% u = User.where("id=?",activity.author_id).first%>
+                  <span class="fr grayTxt">
+                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <div class="massages-content ml15">
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54} %></p>
+                </div>
+                <div class="ml15 mt10">
+                  <span class="grayTxt">发布时间：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <% count=0 %>
+                  <% count=activity.comments.count %>
+                  <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <div>
+            <ul class="wlist" id="pages" >
+              <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+            </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
       <% end %>
-      <div>
-        <ul class="wlist" id="pages" >
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index a36020e3d..8a306523f 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -15,54 +15,58 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% topics.each do |activity| %>
-          <div class="list-file">
-            <div><span class="item_list fl"></span>
-              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                  <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
-              <% else %>
-                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
-              <% end %>
-              <% if activity.sticky == 1 %>
-                  <span class="fl ml10 red-cir-btn">顶</span>
-              <% end%>
-              <% if activity.locked %>
-                  <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
-              <% end %>
-              <% u = User.where("id=?",activity.author_id).first%>
-              <span class="fr grayTxt">
-                  发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-              </span>
-              <div class="cl"></div>
-            </div>
-            <div class="massages-content ml15">
-              <% if activity.parent_id.nil? %>
-                  <% content = activity.content %>
-              <% else %>
-                  <% content = activity.parent.content %>
-              <% end %>
-              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54 } %></p>
-            </div>
-            <div class="ml15 mt10">
-              <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-              <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
-              <% count=0 %>
-              <% if activity.parent %>
-                  <% count=activity.parent.children.count%>
-              <% else %>
-                  <% count=activity.children.count%>
-              <% end %>
-              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
-            </div>
+      <% if topics.any? %>
+          <% topics.each do |activity| %>
+              <div class="list-file">
+                <div><span class="item_list fl"></span>
+                  <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                      <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+                  <% else %>
+                      <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+                  <% end %>
+                  <% if activity.sticky == 1 %>
+                      <span class="fl ml10 red-cir-btn">顶</span>
+                  <% end%>
+                  <% if activity.locked %>
+                      <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                  <% end %>
+                  <% u = User.where("id=?",activity.author_id).first%>
+                  <span class="fr grayTxt">
+                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <div class="massages-content ml15">
+                  <% if activity.parent_id.nil? %>
+                      <% content = activity.content %>
+                  <% else %>
+                      <% content = activity.parent.content %>
+                  <% end %>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54 } %></p>
+                </div>
+                <div class="ml15 mt10">
+                  <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
+                  <% count=0 %>
+                  <% if activity.parent %>
+                      <% count=activity.parent.children.count%>
+                  <% else %>
+                      <% count=activity.children.count%>
+                  <% end %>
+                  <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <div>
+            <ul class="wlist" id="pages" >
+              <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+            </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
       <% end %>
-      <div>
-        <ul class="wlist" id="pages" >
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index 2fbf8e6ce..212798eb1 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -14,42 +14,46 @@
   </div>
 
   <div class="bloglistbox">
-    <% @courses.each do |course|%>
-        <ul class="list-file">
-          <li>
-            <span class="item_list fl"></span>
-            <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                        :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
-            <% teacher = User.where("id=?",course.tea_id).first%>
-            <span class="fr grayTxt">
-                <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
-            </span>
-          </li>
+    <% if @courses.any? %>
+        <% @courses.each do |course|%>
+            <ul class="list-file">
+              <li>
+                <span class="item_list fl"></span>
+                <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                <% teacher = User.where("id=?",course.tea_id).first%>
+                <span class="fr grayTxt">
+                    <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
+                </span>
+              </li>
+              <div class="cl"></div>
+                <li class="ml15">
+                  <span class="grayTxt">
+                      创建时间：<%= format_time(course.created_at) %>
+                  </span>
+                  <span class="grayTxt">更新时间：<%= format_time(course.updated_at) %></span>
+                  <span class="grayTxt">
+                      开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
+                  </span>
+                  <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
+                      <% homework_num = course.homework_commons.count %>
+                  <% else %>
+                      <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
+                  <% end %>
+                  <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
+                </li>
+              <div class="cl"></div>
+            </ul>
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          </ul>
           <div class="cl"></div>
-            <li class="ml15">
-              <span class="grayTxt">
-                  创建时间：<%= format_time(course.created_at) %>
-              </span>
-              <span class="grayTxt">更新时间：<%= format_time(course.updated_at) %></span>
-              <span class="grayTxt">
-                  开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
-              </span>
-              <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
-                  <% homework_num = course.homework_commons.count %>
-              <% else %>
-                  <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
-              <% end %>
-              <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
-            </li>
-          <div class="cl"></div>
-        </ul>
+        </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-    <div>
-      <ul class="wlist" id="pages" >
-        <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-      </ul>
-      <div class="cl"></div>
-    </div>
   </div>
 </div>
 
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
index fbc02c848..b7b4948e4 100644
--- a/app/views/users/_user_project_list.html.erb
+++ b/app/views/users/_user_project_list.html.erb
@@ -14,31 +14,35 @@
   </div>
 
   <div class="bloglistbox">
-    <% @projects.each do |project|%>
-        <ul class="list-file">
-          <li>
-            <span class="item_list fl"></span>
-            <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
-            <% projectUser = User.where("id=?",project.user_id).first%>
-            <span class="fr grayTxt">
-                <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>
-            </span>
-          </li>
+    <% if @projects.any? %>
+        <% @projects.each do |project|%>
+            <ul class="list-file">
+              <li>
+                <span class="item_list fl"></span>
+                <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+                <% projectUser = User.where("id=?",project.user_id).first%>
+                <span class="fr grayTxt">
+                    <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>
+                </span>
+              </li>
+              <div class="cl"></div>
+              <li class="ml15">
+                <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
+                <span class="grayTxt">更新时间：<%= format_time(project.updated_on) %></span>
+                <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
+              </li>
+              <div class="cl"></div>
+            </ul>
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          </ul>
           <div class="cl"></div>
-          <li class="ml15">
-            <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
-            <span class="grayTxt">更新时间：<%= format_time(project.updated_on) %></span>
-            <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
-          </li>
-          <div class="cl"></div>
-        </ul>
+        </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-    <div>
-      <ul class="wlist" id="pages" >
-        <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-      </ul>
-      <div class="cl"></div>
-    </div>
   </div>
 </div>