From 3bd62310ada6848b88c2bcb502cc4b23f9b76cf1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 15 Sep 2015 16:45:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0word-wrap=E5=8F=8Aword-br?= =?UTF-8?q?eak?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/journals/diff.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb index 190459b71..7768f0833 100644 --- a/app/views/journals/diff.html.erb +++ b/app/views/journals/diff.html.erb @@ -1,7 +1,7 @@

<%=h @issue.tracker %> #<%= @issue.id %>

由<%= @journal.user %> 更新于 <%= format_time @journal.created_on %>

-
+
<%= simple_format_without_paragraph @diff.to_html %>
From 5155e8794fbbce6ebbcfe711af38d038d42ae50a Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 16 Sep 2015 11:28:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=86=E8=AF=BE=E7=A8=8B=E7=95=99?= =?UTF-8?q?=E8=A8=80=E5=8A=A0=E5=85=A5=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 9 ++- app/views/users/user_messages.html.erb | 77 ++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index c44b1aeee..bdc1615c6 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -190,13 +190,20 @@ class JournalsForMessage < ActiveRecord::Base end end - # 课程作品留言消息通知 + # 课程留言消息通知 def act_as_course_message if self.jour_type == 'StudentWorksScore' if self.user_id != self.jour.user_id self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.student_work.homework_common.course.id, :viewed => false) end end + else if jour_type == 'Course' + self.jour.members.each do |m| + if m.user_id != self.user_id + self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.jour.id, :viewed => false) + end + end + end end # 用户留言消息通知 diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 90463a318..f9ceba602 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -170,15 +170,36 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> - <% if ma.course_message_type == "JournalsForMessage" %> - - <% end %> + <% if ma.course_message_type == "JournalsForMessage" %> + <% if ma.course_message.jour_type == 'Course' %> + + + <% else %> + + <% end %> + <% end %> <% end %> <% if ma.class == ForgeMessage %> @@ -340,7 +361,7 @@ <% end %> <%# 系统消息 %> <% if ma.class == SystemMessage %> -
      +
      • Trustie平台发布新消息：
        • -
      • +
      • <%= link_to ma.content.nil? ? ma.description.html_safe : ma.content.html_safe, user_message_path(User.current, :type => "system_messages"), :class => "#{params[:type]=="unviewed" ? "newsBlack" : "newsRed"}", + :id => "content_link_#{ma.id}", :onmouseover =>"message_titile_show($(this),event);", :onmouseout => "message_titile_hide($(this));" %> + + +