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

Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_activities.html.erb
	public/stylesheets/new_user.css

app/assets/javascripts/system_messages.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/system_messages.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the SystemMessages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/admin_controller.rb

@@ -79,6 +79,11 @@ class AdminController < ApplicationController
     end
   end
 
+  # 系统消息
+  def messages
+    @admin_messages = SystemMessage.new
+  end
+
   def plugins
     @plugins = Redmine::Plugin.all
   end

app/controllers/courses_controller.rb

@@ -468,6 +468,7 @@ class CoursesController < ApplicationController
   end
 
   def new
+    if User.current.login?
       @course_type = params[:course_type] ||= params[:course]
       @issue_custom_fields = IssueCustomField.sorted.all
       @trackers = Tracker.sorted.all
@@ -475,6 +476,9 @@ class CoursesController < ApplicationController
       @course.safe_attributes = params[:course]
       # month = Time.now.month
       render :layout => 'new_base'
+    else
+      redirect_to signin_url
+    end
   end
 
   def desc_sort_course_by_avtivity(activity_count, courses)

app/controllers/homework_common_controller.rb

@@ -154,7 +154,21 @@ class HomeworkCommonController < ApplicationController
 
       #编程作业相关属性
       if @homework.homework_type == 2
+          @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
+          @homework_detail_programing = @homework.homework_detail_programing
+          @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          @homework_detail_programing.language = params[:language_type].to_i
 
+          @homework.homework_tests.delete_all
+          inputs = params[:program][:input]
+          if Array === inputs
+            inputs.each_with_index do |val, i|
+              @homework.homework_tests << HomeworkTest.new(
+                  input: val,
+                  output: params[:program][:output][i]
+              )
+            end
+          end
       end
 
       if @homework.save
@@ -204,11 +218,11 @@ class HomeworkCommonController < ApplicationController
   #关闭匿评
   def stop_anonymous_comment
     @homework_detail_manual.update_column('comment_status', 3)
-
+    #计算缺评扣分---->计算缺评数量
     work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
     @homework.student_works.each do |student_work|
       absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
+      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count : 0
       student_work.save
     end
 

app/controllers/issues_controller.rb

@@ -114,8 +114,10 @@ class IssuesController < ApplicationController
   def show
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = @issue.forge_messages
-    if User.current.id == @issue.assigned_to_id
-      query.update_all(:viewed => true)
+    query.each do |m|
+      if m.user_id == User.current.id
+        m.update_attribute(:viewed, true)
+      end
     end
     # 缺陷状态更新
     query_journals = @issue.journals

app/controllers/projects_controller.rb

@@ -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|
@@ -322,6 +323,12 @@ class ProjectsController < ApplicationController
   end
 
   def settings
+    # 修改查看消息状态
+    applied_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =? and viewed =?", User.current.id, @project, "AppliedProject", 0)
+    applied_messages.each do |applied_message|
+      applied_message.update_attributes(:viewed => true)
+    end
+    # end
     @issue_custom_fields = IssueCustomField.sorted.all
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
@@ -342,7 +349,7 @@ class ProjectsController < ApplicationController
       if params[:repository] == "pswd_is_null"
         html  << l(:label_password_not_null)
       end
-      flash[:error] = html if !html.to_s.blank?
+      flash.now[:error] = html if !html.to_s.blank?
     end
       scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
       @repository = Repository.factory(scm)

app/controllers/student_work_controller.rb

@@ -47,13 +47,23 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 消息状态更新
+    # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id
-        homework_message.update_attributes(:viewed => true)
+      if User.current.id == homework_message.user_id && homework_message.viewed == 0
+        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
       end
     end
-
+    # 作品打分消息状态更新
+    studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
+    studentworks_scores.each do |studentworks_score|
+      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
+    end
+    # 作品评论消息状态更新
+    journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
+    journals_for_teacher.each do |journal_for_teacher|
+      journal_for_teacher.update_attributes(:viewed => true)
+    end
+    # 作品留言
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages
@@ -170,15 +180,15 @@ class StudentWorkController < ApplicationController
       student_work.homework_common_id = @homework.id
       student_work.user_id = User.current.id
       student_work.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(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 = @homework.late_penalty
+        student_work.late_penalty = 1
       else
         student_work.late_penalty = 0
       end
-      render_attachment_warning_if_needed(student_work)
 
       if student_work.save
-
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -631,7 +641,7 @@ class StudentWorkController < ApplicationController
       unless @homework.save
         logger.debug @homework.errors.full_messages
       else
-        student_work = @homework.student_works.where(user_id: User.current.id).first
+        student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
       end
     end
     student_work

app/controllers/system_messages_controller.rb

@@ -0,0 +1,94 @@
+class SystemMessagesController < ApplicationController
+  # before_filter :message_author, :only => [:show]
+  #
+  # def message_author
+  #   if(!User.current.logged? && !token.nil?)
+  #
+  #     User.current =try_to_autologin1
+  #   end
+  #   if @system_messages
+  #     render_403 :message => :notice_not_authorized_message
+  #   else
+  #     deny_access
+  #   end
+  # end
+
+  def index
+    @system_messages = SystemMessage.all
+  end
+
+  # def show
+  #   @system_messages = SystemMessage.find(params[:id])
+  # end
+
+  # GET /products/new
+  # def new
+  #   @product = Product.new
+  # end
+
+  # GET /products/1/edit
+  # def edit
+  # end
+
+  # POST /products
+  # POST /products.json
+  def create
+    unless User.current.admin?
+      render_403
+      return
+    end
+    @system_messages = SystemMessage.new
+    @system_messages.content = params[:system_message][:content]
+    @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")}
+        flash[:notice] = l(:notice_successful_message)
+      else
+        if params[:system_message][:content].empty?
+          flash[:error] = l(:label_content_blank_fail)
+        else
+          flash[:error] = l(:label_admin_message_fail)
+        end
+        format.html {redirect_to admin_messages_path}
+      end
+    end
+  end
+
+  # PATCH/PUT /products/1
+  # PATCH/PUT /products/1.json
+  # def update
+  #   respond_to do |format|
+  #     if @product.update(product_params)
+  #       format.html { redirect_to @product, notice: 'Product was successfully updated.' }
+  #       format.json { render :show, status: :ok, location: @product }
+  #     else
+  #       format.html { render :edit }
+  #       format.json { render json: @product.errors, status: :unprocessable_entity }
+  #     end
+  #   end
+  # end
+
+  # DELETE /products/1
+  # DELETE /products/1.json
+  # def destroy
+  #   @system_messages.destroy
+  #   respond_to do |format|
+  #     format.html { redirect_to products_url, notice: 'Product was successfully destroyed.' }
+  #     format.json { head :no_content }
+  #   end
+  # end
+
+  # private
+  # # Use callbacks to share common setup or constraints between actions.
+  # def set_product
+  #   @product = Product.find(params[:id])
+  # end
+  #
+  # # Never trust parameters from the scary internet, only allow the white list through.
+  # def message_params
+  #   params.require(:admin_system_messages).permit(:content)
+  # end
+
+
+end

app/controllers/tags_controller.rb

@@ -230,6 +230,53 @@ class TagsController < ApplicationController
     end
   end
 
+  #更新某个tag名称
+  def update_tag_name
+    @tag_name = params[:tagName]
+    @rename_tag_name = params[:renameName]
+    @taggable_id = params[:taggableId]
+    @taggable_type = numbers_to_object_type(params[:taggableType])
+
+
+    @rename_tag = (ActsAsTaggableOn::Tag.find_by_name(@rename_tag_name))  #查找重命名后的tag
+    @tag_id = (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).id  #重命名前的tag_id
+    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
+    @obj = get_object(@taggable_id,params[:taggableType])
+    if(@rename_tag.nil?) #这次命名的是新的tag
+
+      # 是否还有其他记录 引用了 tag_id
+      @tagging = ActsAsTaggableOn::Tagging.where("tag_id = #{@tag_id}")
+      # 如果taggings表中记录为 1 ，那么改变@tag_id对应的tag的名字
+      if @tagging.count == 1
+        @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+        @tag.update_attributes({:name=>@rename_tag_name})
+      else #如果tagging表中的记录大于1，那么就要新增tag记录
+
+        unless @obj.nil?
+          @obj.tag_list.add(@rename_tag_name.split(","))
+         @obj.save
+        end
+        #删除原来的对应的taggings的记录
+        unless @taggings.nil?
+          @taggings.delete
+        end
+      end
+    else #这是已有的tag
+      # 更改taggings记录里的tag_id
+      unless @taggings.nil?
+        @taggings.update_attributes({:tag_id=>@rename_tag.id})
+      end
+    end
+    @obj_flag =  params[:taggableType]
+    if @obj && @obj_flag == '6' && @obj.container.kind_of?(Course)
+      @course = @obj.container
+      @tag_list = @tag_list = get_course_tag_list @course
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def tag_save
     @select_tag_name = params[:tag_for_save][:tag_name]
     @tags = params[:tag_for_save][:name]

app/controllers/users_controller.rb

@@ -27,19 +27,13 @@ class UsersController < ApplicationController
   menu_item :user_course, :only => :user_courses
   menu_item :user_homework, :only => :user_homeworks
   menu_item :user_project, :only => [:user_projects, :watch_projects]
-  # menu_item :requirement_focus, :only => :watch_bids
   menu_item :requirement_focus, :only => :watch_contests
   menu_item :user_newfeedback, :only => :user_newfeedback
   menu_item :user_messages, :only => :user_messages
 
 
-  #Ended by young
-
-  # edit
-
   #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
-  #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                       :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
                                       :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
@@ -105,6 +99,19 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
+    # 记录当前点击按钮的时间
+    # 考虑到用户未退出刷新消息页面
+    if OnclickTime.where("user_id =?", User.current).first.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)
+    end
+    @user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
     # 当前用户查看消息，则设置消息为已读
     if params[:viewed] == "all"
       course_querys = @user.course_messages
@@ -126,6 +133,19 @@ class UsersController < ApplicationController
         messages.each do |message_all|
           @message_alls << message_all.message
         end
+      when 'unviewed'
+        @message_alls = []
+        messages = MessageAll.where("user_id =?", @user).order("created_at desc")
+        messages.each do |message_all|
+          # 在点击或者刷新消息列表后未读的消息存放在数组
+          if message_all.message.viewed == 0
+            @message_alls << message_all.message
+          end
+        end
+      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'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
       when 'course_message'
@@ -329,11 +349,13 @@ class UsersController < ApplicationController
   #导入作业，确定按钮
   def user_select_homework
     homework = HomeworkCommon.find_by_id params[:checkMenu]
+    homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
     if homework
       @homework.name = homework.name
       @homework.description = homework.description
       @homework.end_time = homework.end_time
+      @homework.homework_type = homework.homework_type
       @homework.course_id = homework.course_id
       homework.attachments.each do |attachment|
         att = attachment.copy
@@ -343,6 +365,19 @@ class UsersController < ApplicationController
         att.save
         @homework.attachments << att
       end
+
+      if homework_detail_programing
+        @homework.homework_detail_programing = HomeworkDetailPrograming.new
+        @homework_detail_programing = @homework.homework_detail_programing
+        @homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+        @homework_detail_programing.language = homework_detail_programing.language
+        homework.homework_tests.each_with_index do |homework_test|
+          @homework.homework_tests << HomeworkTest.new(
+              input: homework_test.input,
+              output: homework_test.output
+          )
+        end
+      end
     end
     respond_to do |format|
       format.js
@@ -354,7 +389,7 @@ class UsersController < ApplicationController
       @user = User.current
       @homework = HomeworkCommon.find(params[:homework_id])
       @is_test = params[:is_test] == 'true'
-      @student_work = @homework.student_works.where(user_id: User.current.id).first
+      @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
       if @student_work.nil?
         @student_work = StudentWork.new
       end
@@ -382,8 +417,16 @@ class UsersController < ApplicationController
 
   def user_commit_homework
     homework = HomeworkCommon.find(params[:homework])
-    student_work = homework.student_works.where(user_id: User.current.id).first
+    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])
@@ -822,7 +865,7 @@ class UsersController < ApplicationController
         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)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{User.current.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('created_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)
       end

app/controllers/wiki_controller.rb

@@ -264,7 +264,7 @@ class WikiController < ApplicationController
     end
     @page.destroy
     respond_to do |format|
-      format.html { redirect_to project_wiki_index_url(@project) }
+      format.html {redirect_to edit_project_wiki_page_url @project, @page.title}
       format.api { render_api_ok }
     end
   end

app/helpers/application_helper.rb

@@ -2304,20 +2304,19 @@ module ApplicationHelper
     # 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'
+        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 => 'fr mr10 work_edit'
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
-          link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
+        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 = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于2时才可以启动匿评"
     end
     link
   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)

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

app/helpers/system_messages_helper.rb

@@ -0,0 +1,2 @@
+module SystemMessagesHelper
+end

app/helpers/users_helper.rb

@@ -52,6 +52,40 @@ module UsersHelper
     end
   end
 
+  def title_for_message type
+    case type
+      when nil
+        '消息'
+      when 'unviewed'
+        '未读消息'
+      when 'apply'
+        '用户申请'
+      when 'system_messages'
+        '系统消息'
+      when 'homework'
+        '作业消息'
+      when 'course_message'
+        '课程讨论'
+      when 'course_news'
+        '课程通知'
+      when 'issue'
+        '项目任务'
+      when 'forum'
+        '贴吧帖子'
+      when 'user_feedback'
+        '用户留言'
+    end
+  end
+
+  # 统计未读消息数
+  def unviewed_message(user)
+    course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+  end
+
   def user_mail_notification_options(user)
     user.valid_notification_options.collect {|o| [l(o.last), o.first]}
   end

app/models/applied_project.rb

@@ -3,6 +3,19 @@ class AppliedProject < ActiveRecord::Base
 
   belongs_to :user
   belongs_to :project
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+
+  after_create :send_appliled_message
+
+  def send_appliled_message
+    # if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+    self.project.members.each do |m|
+      if m.roles.first.to_s.include?("Manager")
+        self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+      end
+    end
+    # end
+  end
 
   #删除用户申请
   def self.deleteappiled(userid, projectid)
@@ -11,5 +24,4 @@ class AppliedProject < ActiveRecord::Base
       applied.destroy
     end
   end
-
 end

app/models/course_activity.rb

@@ -13,6 +13,11 @@ class CourseActivity < ActiveRecord::Base
     user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'").first
     if user_activity
       user_activity.save
+    else
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.course_act.parent.id}").first
+        user_activity.created_at = self.created_at
+        user_activity.save
       else
         user_activity = UserActivity.new
         user_activity.act_id = self.course_act_id
@@ -23,6 +28,7 @@ class CourseActivity < ActiveRecord::Base
         user_activity.save
       end
     end
+  end
 
   def destroy_user_activity
     user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'")

app/models/forge_activity.rb

@@ -28,15 +28,22 @@ class ForgeActivity < ActiveRecord::Base
     user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'").first
     if user_activity
       user_activity.save
+    else
+      if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.forge_act.parent.id}").first
+        user_activity.created_at = self.created_at
+        user_activity.save
       else
         user_activity = UserActivity.new
         user_activity.act_id = self.forge_act_id
         user_activity.act_type = self.forge_act_type
         user_activity.container_type = "Project"
         user_activity.container_id = self.project_id
+        user_activity.user_id = self.user_id
         user_activity.save
       end
     end
+  end
 
   def destroy_user_activity
     user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'")

app/models/homework_common.rb

@@ -60,6 +60,6 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
-  delegate :language_name, :to => :homework_detail_programing
+  delegate :language_name, :language, :to => :homework_detail_programing
 
 end

app/models/issue.rb

@@ -147,6 +147,13 @@ class Issue < ActiveRecord::Base
     unless self.author_id == self.assigned_to_id
       self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
     end
+    if self.tracker_id == 5
+      self.project.members.each do |m|
+        if m.roles.first.to_s.include?("Manager") && m.user_id != self.author_id && m.user_id != self.assigned_to_id
+          self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+        end
+      end
+    end
   end
 
   # 更新缺陷

app/models/mailer.rb

@@ -34,8 +34,10 @@ class Mailer < ActionMailer::Base
     end
     def method_missing(name, *args, &block)
       if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
+        # with delayed_job
         @target.delay.send(name, *args, &block)
       else
+        # without delayed_job
         @target.send(name, *args, &block).deliver
       end
     end

app/models/onclick_time.rb

@@ -0,0 +1,5 @@
+class OnclickTime < ActiveRecord::Base
+  attr_accessible :onclick_time, :user_id
+
+  belongs_to :user
+end

app/models/system_message.rb

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