diff --git a/app/models/comment.rb b/app/models/comment.rb index 0830d8fdd..69753d81c 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -81,8 +81,10 @@ class Comment < ActiveRecord::Base # 课程成员得分（英雄榜） def act_as_student_score - unless self.author.allowed_to?(:as_teacher, self.commented.course) - course_member_score(self.commented.course.id, self.author_id, "NewReply") + if self.commented.course + unless self.author.allowed_to?(:as_teacher, self.commented.course) + course_member_score(self.commented.course.id, self.author_id, "NewReply") + end end end diff --git a/app/models/message.rb b/app/models/message.rb index f18dfc859..92ec0235e 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -287,13 +287,15 @@ class Message < ActiveRecord::Base # 课程成员得分（英雄榜） def act_as_student_score - unless self.author.allowed_to?(:as_teacher, self.course) - if self.parent_id.nil? - # 发帖 - course_member_score(self.course.id, self.author_id, "Message") - else - # 回帖 - course_member_score(self.course.id, self.author_id, "MessageReply") + if self.course + unless self.author.allowed_to?(:as_teacher, self.course) + if self.parent_id.nil? + # 发帖 + course_member_score(self.course.id, self.author_id, "Message") + else + # 回帖 + course_member_score(self.course.id, self.author_id, "MessageReply") + end end end end diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb index b69f52a56..64f34b5aa 100644 --- a/app/views/exercise/_edit_head.html.erb +++ b/app/views/exercise/_edit_head.html.erb @@ -20,7 +20,7 @@ 保存 - + <%= l(:button_cancel)%> @@ -35,6 +35,6 @@ $("#exercise_time").val("<%=exercise.time if exercise.time!= -1 %>"); $("#exercise_publish_time").val("<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil?%>"); /*$("#exercise_description").text("<%#=exercise.exercise_description.html_safe %>");*/ - document.getElementById("exercise_description").innerText = <%=exercise.exercise_description.html_safe %>; + document.getElementById("exercise_description").innerHTML = <%=exercise.exercise_description.html_safe %>; } \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 603f7febb..c8b5a20b0 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -212,7 +212,7 @@ <% contributor_course_scor(@course.id).each do |contributor_score| %> <% unless contributor_score.total_score ==0 %>
  • <%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %> -

    <%=link_to contributor_score.user, user_path(contributor_score.user), :title => contributor_score.user %>

    +

    <%=link_to contributor_score.user.show_name, user_path(contributor_score.user), :title => contributor_score.user.show_name %>

    <%= contributor_score.total_score.to_i %>