diff --git a/app/models/user_feedback_message.rb b/app/models/user_feedback_message.rb index 1dda157d6..02335b8e2 100644 --- a/app/models/user_feedback_message.rb +++ b/app/models/user_feedback_message.rb @@ -8,7 +8,7 @@ class UserFeedbackMessage < ActiveRecord::Base validates :user_id,presence: true validates :journals_for_message_id,presence: true validates :journals_for_message_type, presence: true - after_create :add_user_message + after_save :add_user_message def add_user_message self.message_alls << MessageAll.new(:user_id => self.user_id) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 1fde154bd..f9b96d7cc 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -198,7 +198,7 @@ " ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %>
  • - <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %> + <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %>
  • <%= time_tag(ma.memo.created_at).html_safe %>
    • @@ -215,8 +215,13 @@ <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %> +
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %> + + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", + :title => "#{ma.journals_for_message.notes}", + :onmouseover =>"message_titile_show('message_title')", + :onmouseout => "message_titile_hide('message_title')" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • @@ -237,6 +242,21 @@ + + + + diff --git a/db/migrate/20150831090338_update_userfeedback_time.rb b/db/migrate/20150831090338_update_userfeedback_time.rb deleted file mode 100644 index 860a4881a..000000000 --- a/db/migrate/20150831090338_update_userfeedback_time.rb +++ /dev/null @@ -1,26 +0,0 @@ -class UpdateUserfeedbackTime < ActiveRecord::Migration - def up - user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 - transaction do - for i in 1 ... user_feedback_count do i - UserFeedbackMessage.page(i).per(30).each do |ufm| - if ufm.course_message - if ufm.course_message.respond_to?("created_at") - ufm.created_at = ufm.course_message.created_at - elsif ufm.course_message.respond_to?("created_on") - ufm.created_at = ufm.course_message.created_on - end - ufm.save - - user_feedbach_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first - user_feedbach_messages.created_at = ufm.created_at - user_feedbach_messages.save - end - end - end - end - end - - def down - end -end diff --git a/db/migrate/20150831085920_update_memo_time.rb b/db/migrate/20150901004812_update_memo_message_time.rb similarity index 77% rename from db/migrate/20150831085920_update_memo_time.rb rename to db/migrate/20150901004812_update_memo_message_time.rb index c2ecd0144..e512282a0 100644 --- a/db/migrate/20150831085920_update_memo_time.rb +++ b/db/migrate/20150901004812_update_memo_message_time.rb @@ -1,4 +1,4 @@ -class UpdateMemoTime < ActiveRecord::Migration +class UpdateMemoMessageTime < ActiveRecord::Migration def up memo_count = Memo.all.count / 30 + 1 transaction do @@ -12,7 +12,7 @@ class UpdateMemoTime < ActiveRecord::Migration end memo_message.save - memo_messages = MemoMessage.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first + memo_messages = MessageAll.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first memo_messages.created_at = memo_message.created_at memo_messages.save end diff --git a/db/migrate/20150901004910_update_userfeeback_message_time.rb b/db/migrate/20150901004910_update_userfeeback_message_time.rb new file mode 100644 index 000000000..686bc496e --- /dev/null +++ b/db/migrate/20150901004910_update_userfeeback_message_time.rb @@ -0,0 +1,27 @@ +class UpdateUserfeebackMessageTime < ActiveRecord::Migration + def up + user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 + transaction do + for i in 1 ... user_feedback_count do i + UserFeedbackMessage.page(i).per(30).each do |ufm| + if ufm.journals_for_message + if ufm.journals_for_message.respond_to?("created_at") + ufm.created_at = ufm.journals_for_message.created_at + elsif ufm.journals_for_message.respond_to?("created_on") + ufm.created_at = ufm.journals_for_message.created_on + end + puts ufm.id + ufm.save + + user_feedback_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first + user_feedback_messages.created_at = ufm.created_at + user_feedback_messages.save + end + end + end + end + end + + def down + end +end diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e6b19fb6c..4229b5531 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -963,5 +963,3 @@ img.ui-datepicker-trigger { - -