Merge branch 'szzh' into dev_zanle

Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css

app/controllers/comments_controller.rb

@@ -49,6 +49,9 @@ class CommentsController < ApplicationController
       # end
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
+      user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first
+      user_activity.updated_at = @comment.created_on
+      user_activity.save
     end
 
     if params[:user_activity_id]

app/controllers/courses_controller.rb

@@ -631,6 +631,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

app/controllers/issues_controller.rb

@@ -394,6 +394,9 @@ class IssuesController < ApplicationController
       jour.notes = params[:notes]
       jour.journalized = @issue
       jour.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@issue.id}").first
+      user_activity.updated_at = jour.created_on
+      user_activity.save
       @user_activity_id = params[:user_activity_id]
       respond_to do |format|
         format.js

app/controllers/messages_controller.rb

@@ -161,6 +161,9 @@ class MessagesController < ApplicationController
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
+    user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
+    user_activity.updated_at = Time.now
+    user_activity.save
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/projects_controller.rb

@@ -33,7 +33,7 @@ class ProjectsController < ApplicationController
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
-  before_filter :memberAccess, only: :member
+  # before_filter :memberAccess, only: :member
 
   # accept_rss_auth :index
   accept_api_auth :index, :show, :create, :update, :destroy
@@ -216,6 +216,7 @@ class ProjectsController < ApplicationController
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
+        format.js
       end
     else
       respond_to do |format|
@@ -258,7 +259,8 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-
+    # 更新消息为已读
+    update_message_status(User.current, @project)
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -357,24 +359,57 @@ class ProjectsController < ApplicationController
 
   end
 
+  # 项目邀请用户加入实现过程
   # 两种情况：1、系统外用户；2、系统内用户 (通过邮件判定)
   def send_mail_to_member
+    # 该邮箱未注册过
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
-      email = params[:mail]
-      Mailer.run.send_invite_in_project(email, @project, User.current)
-      @is_zhuce = false
-      flash[:notice] = l(:notice_email_sent, :value => email)
+      if !User.where("login =?", params[:mail]).first.nil?
+        # 用户名唯一，用户修改邮箱，未修改用户名，用户名等同邮箱的情况，默认改用户已经注册
+        user = User.find_by_login(params[:mail].to_s)
+        if !user.member_of?(@project)
+          # 如果已经邀请过该用户，则不重复发送
+          if InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first.nil?
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        else
+          flash[:error] = l(:label_member_of_project, :value => email)
+        end
+      else
+        email = params[:mail]
+        Mailer.send_invite_in_project(email, @project, User.current).deliver
+        @is_zhuce = false
+        flash[:notice] = l(:notice_email_sent, :value => email)
+      end
+
+    # 邮箱地址已被注册
     elsif !User.find_by_mail(params[:mail].to_s).nil?
       user = User.find_by_mail(params[:mail].to_s)
       if !user.member_of?(@project)
-        email = params[:mail]
-        Mailer.run.request_member_to_project(email, @project, User.current)
-        flash[:notice] = l(:notice_email_sent, :value => email)
+        # 如果已经邀请过该用户，则不重复发送
+        invite_list = InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first
+        if invite_list.nil?
+          email = params[:mail]
+          Mailer.request_member_to_project(email, @project, User.current).deliver
+          flash[:notice] = l(:notice_email_sent, :value => email)
+        else
+          # 已经发送过了，则隔3小时才能再次发送
+          if Time.now - invite_list.created_at > 10800
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        end
       else
         flash[:error] = l(:label_member_of_project, :value => email)
       end
     else
-      flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|
@@ -382,25 +417,26 @@ class ProjectsController < ApplicationController
     end
   end
 
-  #发送邮件邀请新用户
+  # 发送邮件邀请新用户页面对应方法
   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|
-          unless inviter_list.user.nil?
-            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
-      end
+      @inviter_lists = InviteList.where(project_id:@project.id).order("created_at desc")
+
+      # @inviters = []
+      # @waiters = []
+      # unless @inviter_lists.blank?
+      #   @inviter_lists.each do|inviter_list|
+      #     unless inviter_list.user.nil?
+      #       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
+      # end
       @is_zhuce = false
       respond_to do |format|
         format.html
@@ -412,16 +448,16 @@ class ProjectsController < ApplicationController
   end
 
   # 邀请Trustie注册用户
-  def invite_members
-    if User.current.member_of?(@project) || User.current.admin? 
-      @member ||= @project.members.new
-        respond_to do |format|
-        format.html
-      end
-    else
-      render_403
-    end
-  end
+  # def invite_members
+  #   if User.current.member_of?(@project) || User.current.admin?
+  #     @member ||= @project.members.new
+  #       respond_to do |format|
+  #       format.html
+  #     end
+  #   else
+  #     render_403
+  #   end
+  # end
 
   def edit
   end
@@ -429,6 +465,11 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # 消息"同意加入项目"
+    if params[:message_id]
+      message_invite(params[:message_id], params[:key])
+    end
+    update_message_status(User.current, @project)
     # params[:login]为邮箱邀请用户加入，主要功能：
     # 1、自动注册
     # 2、加入项目、创建角色
@@ -450,6 +491,10 @@ class ProjectsController < ApplicationController
         flash[:notice] = l(:label_mail_invite_success)
       end
     end
+    # 私有项目非项目成员无法访问成员列表
+    unless @project.is_public?
+      return render_403 unless User.current.member_of?(@project)
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程
@@ -480,6 +525,24 @@ class ProjectsController < ApplicationController
     @members = paginateHelper @members
   end
 
+  def update_message_status(user, project)
+    project_invite_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =?", user, project, "ProjectInvite")
+    project_invite_messages.each do |project_invite_message|
+      project_invite_message.update_attribute(:viewed, true)
+    end
+  end
+
+  def message_invite(message_id, key)
+    forge_message = ForgeMessage.find(message_id)
+    if key == forge_message.secret_key
+      # 情况：用户收到邀请邮件还没看，但是管理员已经把该用户添加进项目
+      if Member.where("user_id =? and project_id =?",forge_message.user_id, forge_message.project_id).first.nil?
+        Member.create(:role_ids => [4], :user_id => forge_message.user_id, :project_id => forge_message.project_id)
+        UserGrade.create(:user_id => forge_message.user_id, :project_id => forge_message.project_id)
+      end
+    end
+  end
+
   #判断指定用户是否为课程教师
   def isCourseTeacher(id)
      result = false

app/controllers/system_messages_controller.rb

@@ -38,14 +38,15 @@ class SystemMessagesController < ApplicationController
       return
     end
     @system_messages = SystemMessage.new
-    @system_messages.content = params[:system_message][:content]
+    @system_messages.description = params[:system_message][:description]
+    @system_messages.subject = params[:system_message][:subject]
     @system_messages.user_id = User.current.id
     respond_to do |format|
       if @system_messages.save
-        format.html {redirect_to user_message_path(User.current, :type => "system_messages")}
+        format.html {redirect_to user_system_messages_path(User.current)}
         flash[:notice] = l(:notice_successful_message)
       else
-        if params[:system_message][:content].empty?
+        if params[:system_messages][:description].empty?
           flash[:error] = l(:label_content_blank_fail)
         else
           flash[:error] = l(:label_admin_message_fail)

app/controllers/users_controller.rb

@@ -40,7 +40,7 @@ class UsersController < ApplicationController
                                       :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -95,24 +95,28 @@ class UsersController < ApplicationController
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
-    unless User.current.logged?
+    if !User.current.logged?
       redirect_to signin_url
       return
+    elsif @user != User.current && !User.current.admin?
+     return render_403
     end
     # 记录当前点击按钮的时间
     # 考虑到用户未退出刷新消息页面
-    if OnclickTime.where("user_id =?", User.current).first.nil?
+    message_time = OnclickTime.where("user_id =?", User.current).first
+    if message_time.nil?
       message_new_time = OnclickTime.new
       message_new_time.user_id = User.current.id
       message_new_time.onclick_time = Time.now
       message_new_time.save
     else
-      message_new_time = OnclickTime.where("user_id =?", User.current).first
-      message_last_time = message_new_time.onclick_time
-      message_new_time.update_attributes(:onclick_time => Time.now)
+      # 24小时内显示
+      contrast_time = Time.now - 86400
+      message_time.update_attributes(:onclick_time => Time.now)
     end
-    @user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
+    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
     # 当前用户查看消息，则设置消息为已读
+    # DO 待优化，只需查出符合条件的再更新
     if params[:viewed] == "all"
       course_querys = @user.course_messages
       forge_querys = @user.forge_messages
@@ -142,8 +146,8 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      when 'system_messages'
-        @message_alls = SystemMessage.order("created_at desc").all
+      # when 'system_messages'
+      #   @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
@@ -193,6 +197,15 @@ class UsersController < ApplicationController
     end
   end
 
+  # 系统消息
+  def user_system_messages
+    @sytem_messages = SystemMessage.order("created_at desc").all
+    @sytem_messages = paginateHelper @sytem_messages, 10
+    respond_to do |format|
+      format.html{render :layout=>'new_base_user'}
+    end
+  end
+
   def user_projects_index
     if User.current.admin?
       memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first
@@ -419,6 +432,14 @@ class UsersController < ApplicationController
     homework = HomeworkCommon.find(params[:homework])
     student_work = StudentWork.where(homework_common_id: homework.id, user_id: User.current.id).first
     if student_work
+
+      #提交作品时，计算是否迟交
+      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
+        student_work.late_penalty = 1
+      else
+        student_work.late_penalty = 0
+      end
+
       student_work.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to student_work_index_url(:homework => params[:homework])
@@ -436,7 +457,8 @@ class UsersController < ApplicationController
         homework.end_time = params[:homework_common][:end_time] || Time.now
         homework.publish_time = Time.now
         homework.homework_type = params[:homework_type].to_i || 1
-        homework.late_penalty = 2
+        homework.late_penalty = 10
+        homework.teacher_priority = 1
         homework.user_id = User.current.id
         homework.course_id = params[:course_id]
 
@@ -444,19 +466,19 @@ class UsersController < ApplicationController
         render_attachment_warning_if_needed(homework)
 
         homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
         homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = Time.now
-        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? homework.end_time + 7 : params[:evaluation_start]
+        homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
         homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-        homework_detail_manual.absence_penalty = 2
+        homework_detail_manual.absence_penalty = 5
         homework.homework_detail_manual = homework_detail_manual
 
         #编程作业相关属性
         if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
-          homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_programing.ta_proportion = 0.5
           homework_detail_programing.language = params[:language_type].to_i
 
           inputs = params[:program][:input]
@@ -613,12 +635,11 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
-    # 更新用户留言消息状态
-    @user.journals_for_messages.each do |jour_message|
-      jour_message.user_feedback_messages.each do |userfeedback_message|
-        if User.current.id == userfeedback_message.user_id
-          userfeedback_message.update_attributes(:viewed => true)
-        end
+    # 自己访问自己的页面才更新消息状态
+    if User.current == @user
+      journals_messages =  UserFeedbackMessage.where("user_id =? and journals_for_message_type =? and viewed =?", User.current.id, "JournalsForMessage", 0)
+      journals_messages.each do |journals_message|
+        journals_message.update_attributes(:viewed => true)
       end
     end
     # end
@@ -845,24 +866,24 @@ class UsersController < ApplicationController
     if params[:type].present?
       case params[:type]
         when "course_homework"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_news"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_message"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_poll"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_issue"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_message"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]

app/controllers/zipdown_controller.rb

@@ -1,4 +1,4 @@
-require 'zip'
+require 'zip'
 class ZipdownController < ApplicationController
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]
@@ -7,7 +7,7 @@ class ZipdownController < ApplicationController
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
 
-  #统一下载功能
+  #统一下载功能 
   def download
     if User.current.logged?
       begin

app/helpers/application_helper.rb

@@ -2297,27 +2297,19 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment homework
-    # if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
-    #
-    # elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
-    #   link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
-    # else
-    #   link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
-    # end
-
     if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-      link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.count >= 2 #作业份数大于2
       case homework.homework_detail_manual.comment_status
-        when 1
-          link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-        when 2
-          link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-        when 3
-          link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
+      when 1
+        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
+      when 2
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+      when 3
+        # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
     else
-      link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于2时才可以启动匿评"
     end
     link
   end
@@ -2325,14 +2317,18 @@ module ApplicationHelper
   def student_new_homework homework
     work = cur_user_works_for_homework homework
     if work.nil?
-      link_to l(:label_commit_homework),  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+      link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
     else
       if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-        "<span class='fr mr10 pr_join_span '>#{l(:label_edit_homework)}</span>".html_safe
-      elsif homework.homework_type == 2 #编程作业不能修改作品
-        "<span class='fr mr10 pr_join_span ' title='编程作业不可修改作品'>作品已交</span>".html_safe
+        link_to "作品已交",  "javascript:void(0);", :class => 'fr mr10 pr_join_span c_white', :title => "开启匿评后不可修改作品"
+      elsif homework.homework_type == 2 #编程作业修改作品
+        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1
+          link_to "作品已交",  "javascript:void(0);", :class => 'fr mr10 pr_join_span c_white', :title => "开启匿评后不可修改作品"
+        else
+          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+        end
       else
-        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit c_blue'
+        link_to "修改作品",  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
       end
     end
   end
@@ -2345,9 +2341,9 @@ module ApplicationHelper
     homework = default_opt[:homework]
     work = cur_user_works_for_homework homework
     if work.nil? && !is_teacher
-      link_to "提交("+homework.student_works.count.to_s+")", new_student_work_path(:homework => homework.id), :class=> default_opt[:class]
+      link_to "提交("+homework.student_works.count.to_s+")", new_student_work_path(:homework => homework.id,:host=> Setting.host_course), :class=> default_opt[:class]
     else
-      link_to "提交("+homework.student_works.count.to_s+")", student_work_index_path(:homework => homework.id), :class=> default_opt[:class]
+      link_to "提交("+homework.student_works.count.to_s+")", student_work_index_path(:homework => homework.id,:host=> Setting.host_course), :class=> default_opt[:class]
     end
   end
 
@@ -2363,7 +2359,7 @@ module ApplicationHelper
         if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
           link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
-          link_to "作品已交",  student_work_index_path(:homework => homework.id),:class => 'c_blue',:title => "编程作业不可修改作品"
+          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
         end
@@ -2372,7 +2368,7 @@ module ApplicationHelper
   end
 
   def student_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual
+    if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status
         when 1
           "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
@@ -2381,10 +2377,6 @@ module ApplicationHelper
         when 3
           "<span class='fr mr10 pr_join_span '>匿评已结束</span>".html_safe
       end
-    elsif homework.homework_type == 0
-      "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
-    elsif homework.homework_type == 2
-      "<span class='fr mr10 pr_join_span '>&nbsp;编程作业&nbsp;&nbsp;</span>".html_safe
     end
   end
 

app/helpers/projects_helper.rb

@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 include AvatarHelper
+include StudentWorkHelper
 module ProjectsHelper
   def link_to_version(version, options = {})
     return '' unless version && version.is_a?(Version)
@@ -75,6 +76,17 @@ module ProjectsHelper
     return result
   end
 
+# 被邀请成员的状态
+  def status_for_ivitied(ivite_list, project)
+    if ivite_list.user.member_of?(project)
+      value = "已经加入了项目！"
+    elsif ivite_list.user.active?
+      value = "邀请已发送，等待用户加入！"
+    else
+      value = "邀请已发送，等待用户激活账号！"
+    end
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},

app/helpers/student_work_helper.rb

@@ -2,17 +2,16 @@
 include UserScoreHelper
 
 module StudentWorkHelper
+  #获取当前用户的项目列表
   def user_projects_option
-    cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1"
-    memberships = User.current.memberships.all(:conditions => cond)
-    projects = memberships.map(&:project)
+    projects = User.current.projects.visible
     not_have_project = []
-    not_have_project << Setting.please_chose
+    not_have_project << "请选择关联项目"
     not_have_project << 0
     type = []
     type << not_have_project
     projects.each do |project|
-      if project != nil
+      if project
         option = []
         option <<  project.name
         option <<  project.id
@@ -100,4 +99,31 @@ module StudentWorkHelper
     end
     result
   end
+
+  #教辅评分比例下拉框
+  def ta_proportion_option
+    type = []
+    i = 0
+    while  i <= 100
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
+
+  def ta_proportion_option_to num
+    type = []
+    i = 0
+    while  i <= num
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
 end

app/models/forge_message.rb

@@ -8,7 +8,7 @@ class ForgeMessage < ActiveRecord::Base
   TYPE_OF_WIKI_ACT = "Wiki"
   TYPE_OF_NEWS_ACT = "News"
 
-  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed
+  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed, :secret_key
 
   belongs_to :forge_message ,:polymorphic => true
   belongs_to :project

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(c c++).at(self.language.to_i - 1)
+    %W(C C++ Python).at(self.language.to_i - 1)
   end
 end

app/models/invite_list.rb

@@ -1,5 +1,5 @@
 class InviteList < ActiveRecord::Base
-  attr_accessible :project_id, :user_id
+  attr_accessible :project_id, :user_id, :mail
   belongs_to :user
   belongs_to :project
 

app/models/issue.rb

@@ -1399,6 +1399,7 @@ class Issue < ActiveRecord::Base
   def attachment_added(obj)
     if @current_journal && @current_journal.user_id == obj.author_id && JournalDetail.find_all_by_value(obj.filename).count == 0
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
+
     end
   end
 
@@ -1407,6 +1408,9 @@ class Issue < ActiveRecord::Base
     if @current_journal && !obj.new_record?
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :old_value => obj.filename)
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
     end
   end
 
@@ -1513,6 +1517,9 @@ class Issue < ActiveRecord::Base
         }
       end
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
       # reset current journal
       init_journal @current_journal.user, @current_journal.notes
     end

app/models/journals_for_message.rb

@@ -190,13 +190,45 @@ 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
+    # 课程留言
+    if self.jour_type == 'Course'
+      receivers = []
+      teachers = []
+      # 获取课程的老师
+      self.jour.members.each do |m|
+        if m.user.allowed_to?(:as_teacher, self.jour)
+          teachers << m
+        end
+      end
+      if self.reply_id == 0  # 主留言，即不是回复某条留言
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id
+            receivers << teacher.user_id
+          end
+        end
+      else # 留言回复
+        reply_to = User.find(self.reply_id)
+        if self.user_id != self.reply_id # 添加我回复的那个人
+          receivers << reply_to.id
+        end
+        # 给老师发送。 过滤条件：老师自己给自己发；回复对象为老师则排除改老师
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id && self.reply_id != teacher.user_id
+            receivers << teacher.user_id
+          end
+        end
+      end
+      receivers.each do |r|
+        self.course_messages << CourseMessage.new(:user_id => r, :course_id => self.jour.id, :viewed => false)
+      end
+    end
   end
 
   # 用户留言消息通知

app/models/mailer.rb

@@ -47,10 +47,46 @@ class Mailer < ActionMailer::Base
     MailerProxy.new(self)
   end
 
+  # 作业匿评开启
+  def send_mail_anonymous_comment_open(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    course.student.each do |student|
+      user = User.find(student.student_id)
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @token = Token.get_token_from_user(user, 'autologin')
+      @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+      @anonymous_comment_close_name = homework_common.name
+      @author = homework_common.user
+      #收件人邮箱
+      recipients << user.mail
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
+  # 作业匿评关闭
+  def send_mail_anonymous_comment_close(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    course.student.each do |student|
+      user = User.find(student.student_id)
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @token = Token.get_token_from_user(user, 'autologin')
+      @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+      @anonymous_comment_close_name = homework_common.name
+      @author = homework_common.user
+      #收件人邮箱
+      recipients << user.mail
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
   # author: alan
-  # 发送邀请未注册用户加入项目邮件
+  # 邀请未注册用户加入项目
   # 功能： 在加入项目的同时自动注册用户
-  def  send_invite_in_project(email, project, invitor)
+  def send_invite_in_project(email, project, invitor)
     @email = email
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
     @password = newpass(6)
@@ -59,8 +95,8 @@ class Mailer < ActionMailer::Base
     login = login.sub(/%40/,'@')
     us = UsersService.new
     # 自动激活用户
-    user = us.register_auto(login, @email, @password)
-    InviteList.create(:user_id => user.id, :project_id => project.id)
+    user = us.register_auto(login, email, @password)
+    InviteList.create(:user_id => user.id, :project_id => project.id, :mail =>email)
     User.current = user unless User.current.nil?
     @user = user
     @token = Token.get_token_from_user(user, 'autologin')
@@ -76,15 +112,23 @@ class Mailer < ActionMailer::Base
     @project_name = "#{project.name}"
     @user = user
     @project = project
-    inviter_lists = InviteList.where(project_id:@project.id, user_id:@user.id).all
-    if inviter_lists.blank?
-      InviteList.create(:user_id => user.id, :project_id => project.id)
+    if InviteList.where("project_id= ? and user_id =? and mail =?", project.id, @user.id, email).first.nil?
+      InviteList.create(:user_id => user.id, :project_id => project.id, :mail => email)
     end
     @token = Token.get_token_from_user(user, 'autologin')
     @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
+    # 发送消息邀请
+    send_message_request_member(user,project)
+    # end
     mail :to => email, :subject => @subject
   end
 
+  # 邀请信息消息 注：forge_message_id 为邀请人ID(特殊情况)
+  def send_message_request_member(user, project)
+    key = newpass(6).to_s
+    ForgeMessage.create(:user_id => user.id, :project_id => project.id, :forge_message_type => "ProjectInvite",:forge_message_id => User.current.id, :viewed => false, :secret_key =>key)
+  end
+
   # author: alan
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
@@ -208,6 +252,20 @@ class Mailer < ActionMailer::Base
     mail :to => user.mail,:subject => subject if has_content
   end
 
+  # 作业截止时间邮件提醒
+  def homework_endtime__added(homework_common, user_id)
+    user = User.find(user_id)
+    @subject = "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+    @token = Token.get_token_from_user(user, 'autologin')
+    @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+    @homework_endtime_name = homework_common.name
+    @author = homework_common.user
+    #收件人邮箱
+    recipient = user.mail
+    mail :to => recipient,
+         :subject => "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+  end
+
   # 公共讨论区发帖、回帖添加邮件发送信息
   def forum_message_added(memo)
     @memo = memo

app/models/member.rb

@@ -30,6 +30,9 @@ class Member < ActiveRecord::Base
   validate :validate_role
 
   before_destroy :set_issue_category_nil
+  # 删除项目成员一并删除该成员的邀请记录
+  after_destroy :delete_ivite_list
+
 
   def role
   end
@@ -97,6 +100,16 @@ class Member < ActiveRecord::Base
     end
   end
 
+  # 删除成员一并删除该成员的邀请信息
+  def delete_ivite_list
+    member_invite_lists = InviteList.where("user_id =? and project_id =?", self.user_id, self.project_id)
+    unless member_invite_lists.nil?
+      member_invite_lists.each do |member_invite_list|
+        member_invite_list.destroy
+      end
+    end
+  end
+
   # Find or initilize a Member with an id, attributes, and for a Principal
   def self.edit_membership(id, new_attributes, principal=nil)
     @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)

app/models/project.rb

@@ -66,8 +66,8 @@ class Project < ActiveRecord::Base
   # has_many :students_for_courses, :dependent => :destroy
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
-  has_many :applied_projects
-  has_many :invite_lists
+  has_many :applied_projects, :dependent => :destroy
+  has_many :invite_lists, :dependent => :destroy
   has_one :dts
 
   # end

app/models/student_work.rb

@@ -32,10 +32,108 @@ class StudentWork < ActiveRecord::Base
           self.system_score = last_test.test_score
         end
     end
-
+    set_final_score self.homework_common,self
   end
   def set_src
     self.description = last_test.src if last_test
   end
 
+  #成绩计算
+  def set_final_score homework,student_work
+    if homework && homework.homework_detail_manual
+      if homework.homework_type == 1 #匿评作业
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.student_score
+            elsif student_work.student_score.nil?
+              student_work.final_score = student_work.teaching_asistant_score
+            else
+              ta_proportion = homework.homework_detail_manual.ta_proportion
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.student_score
+          elsif student_work.student_score.nil?
+            student_work.final_score = student_work.teaching_asistant_score
+          else
+            ta_proportion = homework.homework_detail_manual.ta_proportion
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_ta_score + final_s_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil? #教辅未评分
+              if student_work.student_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_st_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            elsif student_work.student_score.nil? #学生未评分
+              if student_work.teaching_asistant_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_ts_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            else
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_sy_score + final_ts_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          elsif student_work.student_score.nil? #学生未评分
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_ts_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            final_score = final_sy_score + final_ts_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      end
+    end
+  end
 end

app/models/student_work_test.rb

@@ -45,7 +45,7 @@ class StudentWorkTest < ActiveRecord::Base
   private
   def get_success_count
     self.results.inject(0) do |sum, result|
-      sum += (result["status"].to_i == 0 ? 1 : 0)
+      sum += (result["status"] && result["status"].to_i == 0 ? 1 : 0)
     end || 0
   end
 

app/models/system_message.rb

@@ -1,7 +1,8 @@
 class SystemMessage < ActiveRecord::Base
-  attr_accessible :content, :id, :user_id
+  attr_accessible :content, :id, :user_id, :description, :subject
   belongs_to :user
 
-  validates :content, presence: true
-  validates_length_of :content, maximum: 255
+  validates :subject, presence: true
+  # validates :description, presence: true
+  validates_length_of :description, maximum: 10000
 end

app/models/user.rb

@@ -140,7 +140,7 @@ class User < Principal
   has_many :issue_assigns, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Issue"'
   has_many :status_updates, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Journal"'
   # 邮件邀请状态
-  # has_many :invite_lists
+  has_many :invite_lists,  :dependent => :destroy
   # end
 
 ######added by nie
@@ -213,6 +213,8 @@ class User < Principal
   # added by fq
   after_create :act_as_activity, :add_onclick_time
   # end
+  # 更新邮箱用户或用户名的同事，同步更新邀请信息
+  after_update :update_invite_list
 
   scope :in_group, lambda {|group|
     group_id = group.is_a?(Group) ? group.id : group.to_i
@@ -1010,6 +1012,16 @@ class User < Principal
     end
   end
 
+  # 更新邮箱的同事，更新invite_lists表中的邮箱信息
+  def update_invite_list
+    invite_lists = InviteList.where("user_id =?",self.id).all
+    unless invite_lists.blank?
+      invite_lists.each do |invite_list|
+        invite_list.update_attribute(:mail, self.mail)
+      end
+    end
+  end
+
   # Removes references that are not handled by associations
   # Things that are not deleted are reassociated with the anonymous user
   def remove_references_before_destroy