列表优化

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

app/views/blogs/_article.html.erb

@@ -16,6 +16,7 @@
         <div class="cl"></div>
       </div>
       <div class="bloglistbox">
+        <% if topics.any? %>
             <% topics.each do |activity| %>
                 <ul class="list-file">
                   <li><span class="item_list fl"></span>
@@ -61,6 +62,9 @@
               </ul>
               <div class="cl"></div>
             </div>
+        <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+        <% end %>
       </div>
     </div>
 </div>

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();
     }

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();
     }

app/views/users/_course_boardlist.html.erb

@@ -15,6 +15,7 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
+      <% if topics.any? %>
           <% topics.each do |activity| %>
               <div class="list-file">
                 <div><span class="item_list fl"></span>
@@ -63,6 +64,9 @@
             </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
+      <% end %>
     </div>
   </div>
 </div>

app/views/users/_course_newslist.html.erb

@@ -15,6 +15,7 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
+      <% if topics.any? %>
           <% topics.each do |activity| %>
               <div class="list-file">
                 <div><span class="item_list fl"></span>
@@ -47,6 +48,9 @@
             </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
+      <% end %>
     </div>
   </div>
 </div>

app/views/users/_project_boardlist.html.erb

@@ -15,6 +15,7 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
+      <% if topics.any? %>
           <% topics.each do |activity| %>
               <div class="list-file">
                 <div><span class="item_list fl"></span>
@@ -63,6 +64,9 @@
             </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
+      <% end %>
     </div>
   </div>
 </div>

app/views/users/_user_course_list.html.erb

@@ -14,6 +14,7 @@
   </div>
 
   <div class="bloglistbox">
+    <% if @courses.any? %>
         <% @courses.each do |course|%>
             <ul class="list-file">
               <li>
@@ -50,6 +51,9 @@
           </ul>
           <div class="cl"></div>
         </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
+    <% end %>
   </div>
 </div>
 

app/views/users/_user_project_list.html.erb

@@ -14,6 +14,7 @@
   </div>
 
   <div class="bloglistbox">
+    <% if @projects.any? %>
         <% @projects.each do |project|%>
             <ul class="list-file">
               <li>
@@ -39,6 +40,9 @@
           </ul>
           <div class="cl"></div>
         </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
+    <% end %>
   </div>
 </div>