Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/users/_user_message_course.html.erb

@@ -92,7 +92,7 @@
                         :onmouseout => "message_titile_hide($(this))" %>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
-            <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
+            <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
                 <p>
                   <%= User.current.lastname + User.current.firstname %>同学您好！
                   <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
@@ -137,7 +137,7 @@
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学' : '老师' %>您好！
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：
             </p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
@@ -163,7 +163,7 @@
           </li>
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学':'老师'%>您好！
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：
             </p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>

app/views/users/_user_message_forge.html.erb

@@ -56,28 +56,54 @@
         </ul>
     <% end %>
     <% if ma.forge_message_type == "Issue" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
-            <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
-                <div class="fl"><strong>描述：</strong></div>
-                <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+        <% if ma.status == 1%>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
+              </li>
+              <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+                    <div class="fl"><strong>描述：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+                <% end %>
+              </div>
+              <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% else %>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
+              </li>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+                    <div class="fl"><strong>描述：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+                <% end %>
+              </div>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
     <% end %>
     <% if ma.forge_message_type == "Journal" %>
         <ul class="homepageNewsList fl">

lib/tasks/homework_evaluation.rake

@@ -26,7 +26,11 @@ namespace :homework_evaluation do
           end
           homework_detail_manual.update_column('comment_status', 2)
           # 匿评开启消息邮件通知，# 所有人
-          send_message_anonymous_comment(homework_common, 2)
+          #send_message_anonymous_comment(homework_common, 2)
+          course = homework_common.course
+          course.members.each do |m|
+            homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+          end
           # 邮件通知
           Mailer.send_mail_anonymous_comment_close(homework_common).deliver
         else

lib/tasks/issue_due_date.rake

@@ -4,14 +4,12 @@ namespace :issue_due_date do
   task :end_time => :environment do
     contrast_time = Time.now - 86400
     issues = Issue.where("due_date >=? and due_date <=?",contrast_time,Time.now)
-    puts issues
     issues.each do |issue|
       if ForgeMessage.where("forge_message_type =? and forge_message_id =? and status =?", "Issue", issue.id, 1).first.nil?
         recipients = []
         assigner = User.find(issue.assigned_to_id)
         recipients << issue.author
         recipients << assigner
-        puts recipients
         recipients.each do |r|
           issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1)
           # 发送邮件通知