From b1ce342b3d71d1bcbd8267bd3970e54337dc2170 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 6 Jun 2015 09:44:23 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=E5=90=8E=E5=BC=95=E8=B5=B7=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/send_for_user_activities.html.erb | 10 +++++-----
 app/views/mailer/send_for_user_activities.text.erb | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index e1712a15d..3d53acd5a 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -39,7 +39,7 @@
       <% end %>
 
       <!--课程作业-->
-      <% if  !@bids.first.nil? %>
+      <% unless  @bids.empty? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
             <% unless @bids.first.nil?%>
@@ -48,20 +48,20 @@
                       <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                       <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                      <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'), course_url(bid.courses.first, :token => @token.value),
+                      <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course, :token => @token.value),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                       <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
-                      <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
+                      <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value), :class => "wmail_name",
                                   :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                       <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_homework) %></span>
 
-                      <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(:id => bid.id,:token => @token.value),
+                      <%= link_to truncate(bid.name,length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value),
                                   :class => 'wmail_info',
                                   :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                       %>
-                      <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(bid.created_on) %></span>
+                      <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(bid.created_at) %></span>
                     </li>
                 <% end %>
             <% end %>
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index 2a2382301..669aca3d1 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -27,27 +27,27 @@
         <% end %>
 
   <% end %>
-  <% if  !@bids.first.nil? %>
+  <% unless  @bids.empty? %>
     <%= l(:label_homework_overview) %><%= @bids.count %>
         <% unless @bids.first.nil?%>
             <% @bids.each do |bid| %>
                ▪
                 [
 
-                  <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'),course_url(bid.courses.first, :token => @token.value)
+                  <%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value)
                                
                                 %>
                  ]
 
-                  <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value)  
+                  <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value)
                                %>
                <%= l(:label_course_homework) %>
 
-                  <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(bid,:token => @token.value)
+                  <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value)
                                
                                
                   %>
-                 <%= format_time(bid.created_on) %>
+                 <%= format_time(bid.created_at) %>
 
             <% end %>
         <% end %>

From 1a3a23b0ed3928c77aa67292d7a84280a390b54f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 6 Jun 2015 09:44:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?BId=E5=B7=B2=E5=8F=96=E6=B6=88=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 1325ef613..ec46917d9 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -199,8 +199,8 @@ class Mailer < ActionMailer::Base
     @title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
     @issue_author_url = url_for(user_activities_url(@user))
     @url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
-             when :Bid
-               course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+             # when :Bid
+             #   course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
              when :Project
                return -1 if journals_for_message.jour.project_type == Project::ProjectType_project
                project_feedback_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
@@ -236,12 +236,12 @@ class Mailer < ActionMailer::Base
       mail :to => @recipients,
            :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} ",
            :filter => true
-    elsif journals_for_message.jour.class.to_s.to_sym == :Bid
-      if !journals_for_message.jour.author.notify_about? journals_for_message
-        return -1
-      end
-
-      mail :to => recipients, :subject => @title,:filter => true
+    # elsif journals_for_message.jour.class.to_s.to_sym == :Bid
+    #   if !journals_for_message.jour.author.notify_about? journals_for_message
+    #     return -1
+    #   end
+    #
+    #   mail :to => recipients, :subject => @title,:filter => true
     elsif journals_for_message.jour.class.to_s.to_sym == :Contest
       if !journals_for_message.jour.author.notify_about? journals_for_message
         return -1

From 7e89cd27aacfd30390788a4f3faf589c16a97d9e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 6 Jun 2015 10:22:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb           | 16 +++++++++-------
 .../mailer/send_for_user_activities.html.erb     |  1 -
 .../projects/invite_members_by_mail.html.erb     |  6 ++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1793eb39c..70efa47fa 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -367,13 +367,15 @@ class ProjectsController < ApplicationController
       @inviter_lists = InviteList.where(project_id:@project.id).all
       unless @inviter_lists.blank?
         @inviter_lists.each do|inviter_list|
-          @inviters = []
-          @waiters = []
-          @inviters << inviter_list.user
-          @inviters_count = @inviters.size
-          unless inviter_list.user.member_of?(@project)
-            @waiters << inviter_list.user
-            @waiters_count = @waiters.size
+          inviters = []
+          waiters = []
+          inviters << inviter_list.user
+          @inviters_count = inviters.size
+          unless inviter_list.user.nil?
+            unless inviter_list.user.member_of?(@project)
+              waiters << inviter_list.user
+              @waiters_count = waiters.size
+            end
           end
         end
       end
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 3d53acd5a..9723783fe 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -138,7 +138,6 @@
               <%= l(:label_course_attendingcontestwork_download) %>
               <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @attachments.count %>)</span>
             </h4>
-
             <% @attachments.each do |attachment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 7b3a4c552..349bc2b56 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -90,8 +90,10 @@
       <% unless @waiters_count.nil? %>
         <span class="status_inviter">等待加入项目的用户</span><br/>
         <% @inviter_lists.each do |inviter_list| %>
-          <% unless inviter_list.user.member_of?(@project) %>
-            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
+          <% unless inviter_list.user.nil? %>
+            <% unless inviter_list.user.member_of?(@project) %>
+                <%= inviter_list.user.name %><br/>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>

From 543ae1bbd027e122e428812682d15075398605fe Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 6 Jun 2015 11:39:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E9=80=BB=E8=BE=91=EF=BC=9A?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=B7=B2=E5=8A=A0=E5=85=A5=E5=92=8C=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=E5=8A=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb           | 15 ++++++++-------
 .../projects/invite_members_by_mail.html.erb     | 16 ++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 70efa47fa..efe5a52ee 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -365,16 +365,17 @@ class ProjectsController < ApplicationController
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
       @inviter_lists = InviteList.where(project_id:@project.id).all
+      @inviters = []
+      @waiters = []
       unless @inviter_lists.blank?
         @inviter_lists.each do|inviter_list|
-          inviters = []
-          waiters = []
-          inviters << inviter_list.user
-          @inviters_count = inviters.size
           unless inviter_list.user.nil?
-            unless inviter_list.user.member_of?(@project)
-              waiters << inviter_list.user
-              @waiters_count = waiters.size
+            if inviter_list.user.member_of?(@project)
+              @inviters << inviter_list.user
+              @inviters_count = @inviters.size
+            else
+              @waiters << inviter_list.user
+              @waiters_count = @waiters.size
             end
           end
         end
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 349bc2b56..4c6ee47d8 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -80,21 +80,17 @@
   <%# 邀请用户的状态 %>
   <% unless @inviter_lists.blank? %>
     <div>
-      <% if @inviters_count > 0 %>
-        <span class="status_inviter">已邀请的用户</span><br/>
-        <% @inviter_lists.each do |inviter_list| %>
-            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
+      <% unless @inviters_count.nil? %>
+        <span class="status_inviter">已加入项目的用户</span><br/>
+        <% @inviters.each do |inv| %>
+            <%= inv.name unless inv.nil? %><br/>
         <% end %>
       <% end %>
       </br>
       <% unless @waiters_count.nil? %>
         <span class="status_inviter">等待加入项目的用户</span><br/>
-        <% @inviter_lists.each do |inviter_list| %>
-          <% unless inviter_list.user.nil? %>
-            <% unless inviter_list.user.member_of?(@project) %>
-                <%= inviter_list.user.name %><br/>
-            <% end %>
-          <% end %>
+        <% @waiters.each do |wai| %>
+          <%= wai.name unless wai.nil?%><br/>
         <% end %>
       <% end %>
     </div>