diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index db972941e..35428e18e 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -627,6 +627,11 @@ class CoursesController < ApplicationController end def feedback + @course.journals_for_messages.each do |messages| + query = messages.course_messages.where("user_id = ?", User.current.id) + query.update_all(:viewed => true); + end + if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course))) page = params[:page] # Find the page of the requested reply 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/journals/diff.html.erb b/app/views/journals/diff.html.erb index 190459b71..b842d87d0 100644 --- a/app/views/journals/diff.html.erb +++ b/app/views/journals/diff.html.erb @@ -1,8 +1,8 @@

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

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

-
- <%= simple_format_without_paragraph @diff.to_html %> +
+ <%= @diff.to_html.gsub("<","<").gsub(">",">").gsub(""","\"").gsub("&gt;", ">").gsub("&lt;", "<").gsub("&quot;", "\"").html_safe %>

<%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %>

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 90463a318..4c24f0d0a 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 %> -