diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 12caefde2..900af0e77 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -155,7 +155,7 @@ class UsersController < ApplicationController @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc") @message_alls_count = @message_alls.count when 'issue' - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).reverse + @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc") @message_alls_count = @message_alls.count when 'issue_update' # 缺陷状态更新、留言 @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc") diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 65d1cb591..207572a1c 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -44,7 +44,7 @@ <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.title}" %> -
  • <%= time_tag(ma.course_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.course_message_type == "Comment" %> @@ -55,7 +55,7 @@ <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.comments.html_safe}" %> -
  • <%= time_tag(ma.course_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.course_message_type == "HomeworkCommon" %> @@ -64,7 +64,7 @@
  • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布了作业:
  • <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %>
  • -
  • <%= time_tag(ma.course_message.created_at).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.course_message_type == "Poll" %> @@ -75,7 +75,7 @@ <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id), :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.polls_name}" %> -
  • <%= time_tag(ma.course_message.created_at).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.course_message_type == "Message" %> @@ -86,7 +86,7 @@ <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %> -
  • <%= time_tag(ma.course_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> @@ -98,7 +98,7 @@ <% unless ma.content.nil? %> <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.content.html_safe}" %> <% end %> -
  • <%= time_tag(ma.course_message.created_at).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.course_message_type == "JournalsForMessage" %> @@ -107,7 +107,7 @@
  • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">回复了作品评论:
  • <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %>
  • -
  • <%= time_tag(ma.course_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% end %> @@ -125,7 +125,7 @@
  • <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.forge_message.subject}" %>
  • -
  • <%= time_tag(ma.forge_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.forge_message_type == "Journal" %> @@ -143,7 +143,7 @@ issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{get_issue_des_update(ma.forge_message).html_safe}" %> -
  • <%= time_tag(ma.forge_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.forge_message_type == "Message" %> @@ -156,7 +156,7 @@ :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.forge_message.subject.html_safe}" %> -
  • <%= time_tag(ma.forge_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.forge_message_type == "News" %> @@ -171,7 +171,7 @@
  • <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %>
  • -
  • <%= time_tag(ma.forge_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% if ma.forge_message_type == "Comment" %> @@ -182,7 +182,7 @@
  • <%= link_to "#{ma.forge_message.comments.html_safe}", {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%>
  • -
  • <%= time_tag(ma.forge_message.created_on).html_safe %>
  • +
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> <% end %> diff --git a/db/migrate/20150829081822_update_message_time.rb b/db/migrate/20150829081822_update_message_time.rb index 31dcb0b4f..fe670e9b8 100644 --- a/db/migrate/20150829081822_update_message_time.rb +++ b/db/migrate/20150829081822_update_message_time.rb @@ -19,26 +19,6 @@ class UpdateMessageTime < ActiveRecord::Migration end end end - - forge_count = ForgeMessage.all.count / 30 + 1 - transaction do - for i in 1 ... forge_count do i - ForgeMessage.page(i).per(30).each do |fmessage| - if fmessage.forge_message - if fmessage.forge_message.respond_to?("created_at") - fmessage.created_at = fmessage.forge_message.created_at - elsif fmessage.forge_message.respond_to?("created_on") - fmessage.created_at = fmessage.forge_message.created_on - end - fmessage.save - - forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first - forge_all_message.created_at = fmessage.created_at - forge_all_message.save - end - end - end - end end def down diff --git a/db/migrate/20150829130302_update_forge_message_time.rb b/db/migrate/20150829130302_update_forge_message_time.rb new file mode 100644 index 000000000..70811c307 --- /dev/null +++ b/db/migrate/20150829130302_update_forge_message_time.rb @@ -0,0 +1,26 @@ +class UpdateForgeMessageTime < ActiveRecord::Migration + def up + forge_count = ForgeMessage.all.count / 30 + 1 + transaction do + for i in 1 ... forge_count do i + ForgeMessage.page(i).per(30).each do |fmessage| + if fmessage.forge_message + if fmessage.forge_message.respond_to?("created_at") + fmessage.created_at = fmessage.forge_message.created_at + elsif fmessage.forge_message.respond_to?("created_on") + fmessage.created_at = fmessage.forge_message.created_on + end + fmessage.save + + forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first + forge_all_message.created_at = fmessage.created_at + forge_all_message.save + end + end + end + end + end + + def down + end +end