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 @@
- <% topics.each do |activity| %> - +
+ <% else %> +

<%= l(:label_no_data) %>

<% end %> -
- -
-
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%>