Merge branch 'szzh' into dev_zanle

Conflicts:
	app/services/courses_service.rb

.gitignore

@@ -29,3 +29,4 @@ vendor/cache
 /public/images/avatars
 /public/files
 /tags
+/config/initializers/gitlab_config.rb

Gemfile

@@ -6,7 +6,8 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
-gem 'grack', path:'./lib/grack'
+gem 'grack', path:'lib/grack'
+gem 'gitlab', path: 'lib/gitlab-cli'
 gem 'rest-client'
 gem "mysql2", "= 0.3.18"
 gem 'redis-rails'
@@ -45,7 +46,7 @@ group :development, :test do
     gem 'pry-stack_explorer'
     if RUBY_PLATFORM =~ /darwin/
       gem 'puma'
-    end
+  end
   end
 
   gem 'rspec-rails', '~> 3.0'

app/controllers/application_controller.rb

@@ -38,7 +38,8 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   def handle_unverified_request
     super
-    cookies.delete(autologin_cookie_name)
+    raise(ActionController::InvalidAuthenticityToken)
+    # cookies.delete(autologin_cookie_name)
   end
 
   before_filter :find_first_page

app/controllers/blog_comments_controller.rb

@@ -56,14 +56,28 @@ class BlogCommentsController < ApplicationController
   end
   def destroy
     @article = BlogComment.find(params[:id])
-    if @article.parent_id.nil? #如果是文章被删，那么跳转到用户博客界面
-      @article.children.delete
-      @article.delete
-      redirect_to user_blogs_path(:user_id=>User.current)
-    else
-       root = @article.root
-      @article.delete
-      redirect_to user_blog_blog_comment_path(:user_id=>root.author_id,:blog_id=>root.blog_id,:id=>root.id)
+    if @article.parent_id.nil? #如果是文章被删，那么跳转到用户博客界面，如果带了course_id过来，那么就要跳转到课程首页
+      if params[:course_id] #如果带了课程id过来，说明这是课程大纲，不要删除，只需取消课程大纲就ok了
+        @course = Course.find(params[:course_id])
+        @course.outline = 0
+        @course.save
+        redirect_to course_path(:id=>params[:course_id])
+      else
+        @article.children.delete
+        @article.delete
+        redirect_to user_blogs_path(:user_id=>User.current)
+      end
+
+    else#如果是回复被删，
+      if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的
+        @article.delete
+        redirect_to syllabus_course_path(:id=>params[:course_id])
+      else
+        root = @article.root
+        @article.delete
+        redirect_to user_blog_blog_comment_path(:user_id=>root.author_id,:blog_id=>root.blog_id,:id=>root.id)
+      end
+
     end
   end
 
@@ -81,6 +95,7 @@ class BlogCommentsController < ApplicationController
 
     @content = "> #{ll(Setting.default_language, :text_user_wrote, @blogComment.author.realname)}\n> "
     @temp = BlogComment.new
+    @course_id = params[:course_id]
     @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @blogComment.author.realname)} <br/>#{@blogComment.content.html_safe}</blockquote>".html_safe
     respond_to do | format|
       format.js
@@ -89,6 +104,9 @@ class BlogCommentsController < ApplicationController
 
   #回复
   def reply
+    if params[:in_user_center]
+      @in_user_center = true
+    end
     @article = BlogComment.find(params[:id]).root
     @quote = params[:quote][:quote]
     @blogComment = BlogComment.new
@@ -101,13 +119,24 @@ class BlogCommentsController < ApplicationController
     @blogComment.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
     @article.children << @blogComment
     @user_activity_id = params[:user_activity_id]
-
+    user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    if user_activity
+      user_activity.updated_at = Time.now
+      user_activity.save
+    end
     attachments = Attachment.attach_files(@blogComment, params[:attachments])
     render_attachment_warning_if_needed(@blogComment)
     #@article.save
    # redirect_to user_blogs_path(:user_id=>params[:user_id])
     respond_to do |format|
-      format.html { redirect_to user_blog_blog_comment_path(:user_id=>@article.author_id,:blog_id=>@article.blog_id,:id=>@article)}
+      format.html {
+        if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+          redirect_to syllabus_course_path(:id=>params[:course_id])
+        else
+          redirect_to user_blog_blog_comment_path(:user_id=>@article.author_id,:blog_id=>@article.blog_id,:id=>@article)
+        end
+
+      }
       format.js
     end
   rescue Exception => e #如果上面的代码执行发生异常就捕获

app/controllers/courses_controller.rb

@@ -36,7 +36,6 @@ class CoursesController < ApplicationController
         join = cs.join_course params,@user
         @state = join[:state]
         @course = join[:course]
-        Mailer.run.join_course_request(@course, User.current, params[:role])
       # else
       #   @course = Course.find_by_id params[:object_id]
       #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
@@ -108,7 +107,7 @@ class CoursesController < ApplicationController
       courses = Course.visible
       @courses = paginateHelper courses,10
     else
-      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
+      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'").order("time desc, created_at desc")
       @courses = paginateHelper courses,10
     end
    @name = params[:name]
@@ -712,6 +711,41 @@ class CoursesController < ApplicationController
     end
   end
 
+  #从课程创建的老师那里选择课程大纲
+  def course_outline
+      @teacher = User.find(@course.tea_id)
+      @blog_articles = @teacher.blog.articles
+      @is_in_show_outline_page = params[:is_in_show_outline_page]
+      respond_to do |format|
+        format.js
+      end
+  end
+
+  #根据关键字搜索，查找方法一样的，但返回内容不一样
+  def search_course_outline
+     @article_title = params[:title]
+     @teacher = User.find(@course.tea_id)
+     @blog_articles = @teacher.blog.articles.like(@article_title)
+     render :json=>@blog_articles.to_json
+  end
+
+  #设置或者更改课程的大纲
+  def set_course_outline
+    @course.outline = params[:outline_id]
+    @course.save
+    @is_in_show_outline_page = params[:is_in_show_outline_page]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #显示课程大纲
+  def syllabus
+    @article = BlogComment.find(@course.outline)
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
+  end
   #删除课程
   #删除课程只是将课程的is_delete状态改为false，is_delete为false状态的课程只有管理员可以看到
   def destroy

app/controllers/files_controller.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -378,6 +379,8 @@ class FilesController < ApplicationController
            tag_name = l(:label_media)
          when "4"
            tag_name = l(:label_code)
+         when "6"
+            tag_name = "论文"
          else
            tag_name = ""
          end

app/controllers/homework_common_controller.rb

@@ -47,10 +47,18 @@ class HomeworkCommonController < ApplicationController
     if params[:homework_common]
       @homework.name = params[:homework_common][:name]
       @homework.description = params[:homework_common][:description]
+      if params[:homework_common][:publish_time] == ""
+        @homework.publish_time = Date.today
+      else
+        @homework.publish_time = params[:homework_common][:publish_time]
+      end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
+      if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
+        homework_detail_manual.comment_status = 1
+      end
       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]
 
@@ -217,7 +225,12 @@ class HomeworkCommonController < ApplicationController
 
   #评分设置
   def score_rule_set
-
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course]
   end
 
   private

app/controllers/members_controller.rb

@@ -159,6 +159,14 @@ class MembersController < ApplicationController
               if role && (role.name == "学生" || role.name == "Student")
                 StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id)
               end
+
+              #给新成员和老师发送加入课程的消息，发送者id放在CourseMessage的course_message_id字段中
+              #course_message_type设置为JoinCourse
+              #status = 0 表示给学生发，status = 1表示给老师发
+              course_join = CourseMessage.new(:user_id =>user_id, :course_message_id=>User.current.id,:course_id => @course.id,:course_message_type=>"JoinCourse", :content => role, :viewed => false, :status => 0)
+              course_join.save
+              CourseMessage.create(:user_id => User.current.id, :course_message_id => user_id, :course_id => @course.id, :course_message_type => "JoinCourse",:content => role, :viewed => false, :status => 1)
+
               members << member
               #user_grades << UserGrade.new(:user_id => user_id, :course_id => @course.id)
               if (params[:membership][:role_ids])
@@ -305,7 +313,8 @@ class MembersController < ApplicationController
             grade.destroy
           end
         end
-         ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
+        #移出项目发送消息
+        ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_projects }
@@ -333,6 +342,8 @@ class MembersController < ApplicationController
         end
         @roles = Role.givable.all[3..5]
         @members = @course.member_principals.includes(:roles, :principal).all.sort
+        #移出课程发送消息
+        CourseMessage.create(:user_id => @member.user_id, :course_id => @course.id, :course_message_type => "RemoveFromCourse", :viewed => false, :course_message_id => User.current.id)
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_courses }

app/controllers/student_work_controller.rb

@@ -108,6 +108,7 @@ class StudentWorkController < ApplicationController
       else
         @stundet_works = []
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
       if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
@@ -128,6 +129,7 @@ class StudentWorkController < ApplicationController
       else
         @stundet_works = []
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -456,14 +458,14 @@ class StudentWorkController < ApplicationController
         student_work.save
       end
     end
-    respond_to do |format|
-      format.html{
-        if params[:student_path]
-          redirect_to student_work_index_url(:homework => @homework.id)
-        else
-          redirect_to user_homeworks_user_path(User.current.id)
-        end
-      }
+    if params[:student_path]
+      redirect_to student_work_index_url(:homework => @homework.id)
+    else
+      @user_activity_id = params[:user_activity_id]
+      @is_in_course = params[:is_in_course]
+      respond_to do |format|
+        format.js
+      end
     end
   end
 

app/controllers/users_controller.rb

@@ -243,7 +243,7 @@ class UsersController < ApplicationController
   #status 1 同意 2 拒绝
   def dealwith_apply_request
     @msg = CourseMessage.find(params[:msg_id])
-
+    #CourseMessage content存的是role  7教辅  9 教师
     case params[:agree]
       when 'Y'
         apply_user = User.find(@msg.course_message_id)
@@ -368,7 +368,21 @@ class UsersController < ApplicationController
     if User.current == @user
       @page = params[:page] ? params[:page].to_i + 1 : 0
       user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-      @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+
+      #判断当前用户在当前课程的身份
+      visibleCourse = @user.courses.empty? ? [] : @user.courses.visible
+      homework_ids = []
+      visibleCourse.each do |course|
+        if User.current.allowed_to?(:as_teacher,course)
+          homeworks = HomeworkCommon.where("course_id = #{course.id}")
+          homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+        else
+          homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
+          homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+        end
+      end
+      visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")"
+      @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10)
       @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
       @is_in_course = params[:is_in_course].to_i || 0
       respond_to do |format|
@@ -493,8 +507,12 @@ class UsersController < ApplicationController
         homework = HomeworkCommon.new
         homework.name = params[:homework_common][:name]
         homework.description = params[:homework_common][:description]
-        homework.end_time = params[:homework_common][:end_time] || Time.now
-        homework.publish_time = Time.now
+        homework.end_time = params[:homework_common][:end_time] || Date.today
+        if params[:homework_common][:publish_time] == ""
+          homework.publish_time = Date.today
+        else
+          homework.publish_time = params[:homework_common][:publish_time]
+        end
         homework.homework_type = params[:homework_type].to_i || 1
         homework.late_penalty = 10
         homework.teacher_priority = 1
@@ -506,7 +524,11 @@ class UsersController < ApplicationController
 
         homework_detail_manual = HomeworkDetailManual.new
         homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
-        homework_detail_manual.comment_status = 1
+        if homework.publish_time > Date.today
+          homework_detail_manual.comment_status = 0
+        else
+          homework_detail_manual.comment_status = 1
+        end
         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
@@ -949,10 +971,19 @@ class UsersController < ApplicationController
         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('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}) or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+          blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+          @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}) "+
+                                                    "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+                                                   "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").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})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_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})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+      blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+      @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}) "+
+                                                "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+                                                "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]

app/helpers/application_helper.rb

@@ -609,6 +609,12 @@ module ApplicationHelper
     return @result
   end
 
+  # 判断版本库是否初始为gitlab
+  def rep_is_gitlab?(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab")
+    return rep.blank? ? true :false
+  end
+
   # 判断当前用户是否为项目管理员
   def is_project_manager?(user_id, project_id)
     @result = false
@@ -2355,16 +2361,16 @@ module ApplicationHelper
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         if work.nil?
-          link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 #编程作业不能修改作品
-            link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
           else
-            link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})",  edit_student_work_path(work.id),:class => 'c_blue'
           end
         end
       end

app/helpers/courses_helper.rb

@@ -36,7 +36,7 @@ module CoursesHelper
   #生成课程老师成员链接
   def course_teacher_link teacher_num
     if User.current.member_of_course?(@course) || User.current.admin?
-      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue'
+      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue', :id => 'teacher_number'
     else
       content_tag 'span',teacher_num, :class => 'info_foot_num c_blue'
     end
@@ -45,7 +45,7 @@ module CoursesHelper
   #生成课程学生列表连接
   def course_student_link student_num
     if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?
-      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue'
+      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue', :id => "student_number"
     else
       content_tag 'span',student_num, :class => 'info_foot_num c_blue'
     end
@@ -628,10 +628,10 @@ module CoursesHelper
 
   #重启、关闭课程按钮
   def set_course_time course
-    id = "finish_course_#{course.id}"
-    linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) :  finishcourse_course_path(course, format: :js)
-    desc = course_endTime_timeout?(course) ? l(:label_course_reload) :  l(:label_course_closed)
-    link_to "<span class='pr_close'></span>#{desc}".html_safe, linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc), :class => "pr_join_a"
+    # id = "finish_course_#{course.id}"
+    # linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) :  finishcourse_course_path(course, format: :js)
+    # desc = course_endTime_timeout?(course) ? l(:label_course_reload) :  l(:label_course_closed)
+    # link_to "<span class='pr_close'></span>#{desc}".html_safe, linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc), :class => "pr_join_a"
   end
 
   #加入课程、退出课程按钮

app/helpers/projects_helper.rb

@@ -117,6 +117,22 @@ module ProjectsHelper
     end
   end
 
+  # 获取新增gitlab版本库
+  def rep_gitlab(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab")
+  end
+
+  # 获取新项目的版本库地址
+  def rep_gitlab_url(project)
+    gitlab_address = Redmine::Configuration['gitlab_address']
+    url = gitlab_address.to_s+"/"+project.owner.to_s+"/"+project.identifier+"."+"git"
+  end
+
+  #  # 获取Forge历史版本库
+  def rep_forge(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Git")
+  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/repositories_helper.rb

@@ -25,6 +25,7 @@ module RepositoriesHelper
   end
   PROJECT_PATH_CUT =  40
   REPO_IP_ADDRESS = Setting.host_repository
+  REPO_GITLAB_ADDRESS = "git.trustie.net"
 
   def format_revision(revision)
     if revision.respond_to? :format_identifier
@@ -34,12 +35,21 @@ module RepositoriesHelper
     end
   end
 
+  def repository_creater rep
+    repository_creater = User.find_by_login(rep.login) unless rep.login.nil?
+  end
+
   def truncate_at_line_break(text, length = 255)
     if text
       text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
     end
   end
 
+  def user_commit_rep(mail)
+    user = User.find_by_mail(mail)
+    user.nil? ? User.find(2) :  User.find_by_mail(mail)
+  end
+
   def render_properties(properties)
     unless properties.nil? || properties.empty?
       content = ''

app/models/blog_comment.rb

@@ -7,7 +7,8 @@ class BlogComment < ActiveRecord::Base
   acts_as_tree :counter_cache => :comments_count, :order => "#{BlogComment.table_name}.sticky desc ,#{BlogComment.table_name}.created_on ASC"
   acts_as_attachable
   belongs_to :last_reply, :class_name => 'BlogComment', :foreign_key => 'last_comment_id'
-
+  # 虚拟关联
+  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
   acts_as_watchable
 
   validates_presence_of  :title, :content
@@ -15,6 +16,40 @@ class BlogComment < ActiveRecord::Base
   #validate :cannot_reply_to_locked_comment, :on => :create
   safe_attributes 'title', 'content',"sticky", "locked"
 
+  after_save :add_user_activity
+  before_destroy :destroy_user_activity
+
+  scope :like, lambda {|arg|
+    if arg.blank?
+      where(nil)
+    else
+      pattern = "%#{arg.to_s.strip.downcase}%"
+      where(" LOWER(title) LIKE :p ", :p => pattern)
+    end
+  }
+
+  #在个人动态里面增加当前动态
+  def add_user_activity
+    if self.parent_id.nil? #只有发博文才插入动态
+        user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'").first
+        if user_activity
+          user_activity.save
+        else
+            user_activity = UserActivity.new
+            user_activity.act_id = self.id
+            user_activity.act_type = self.class.to_s
+            user_activity.container_type = "Blog"
+            user_activity.container_id = self.blog_id
+            user_activity.user_id = self.author_id
+            user_activity.save
+        end
+    end
+  end
+
+  def destroy_user_activity
+    user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'")
+    user_activity.destroy_all
+  end
   def deleted_attach_able_by? user
     (user && user.logged? && (self.author == user) ) || user.admin?
   end

app/models/homework_common.rb

@@ -23,7 +23,8 @@ class HomeworkCommon < ActiveRecord::Base
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity, :send_mail, :act_as_course_activity, :act_as_course_message
+  after_create :act_as_activity, :send_mail, :act_as_course_message
+  after_save :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
   def act_as_activity
@@ -33,17 +34,27 @@ class HomeworkCommon < ActiveRecord::Base
   #课程动态公共表记录
   def act_as_course_activity
     if self.course
-      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.course_id)
+      if self.homework_detail_manual.comment_status == 0
+        self.course_acts.destroy_all
+      else
+        if self.course_acts.size == 0
+          self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.course_id)
+        end
+      end
     end
   end
 
   #课程作业消息记录
   def act_as_course_message
     if self.course
-      self.course.members.each do |m|
-        # if m.user_id != self.user_id
+      if self.homework_detail_manual.comment_status == 0
+        self.course_messages.destroy_all
+      else
+        self.course.members.each do |m|
+          # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-        # end
+          # end
+        end
       end
     end
   end
@@ -54,7 +65,9 @@ class HomeworkCommon < ActiveRecord::Base
   end
 
   def send_mail
-    Mailer.run.homework_added(self)
+    if self.homework_detail_manual.comment_status != 0
+      Mailer.run.homework_added(self)
+    end
   end
 
   def is_program_homework?

app/models/member.rb

@@ -34,6 +34,7 @@ class Member < ActiveRecord::Base
   after_destroy :delete_ivite_list
 
 
+
   def role
   end
 

app/models/member_role.rb

@@ -35,8 +35,11 @@ class MemberRole < ActiveRecord::Base
     !inherited_from.nil?
   end
 
+  include Trustie::Gitlab::ManageMember
+
   private
 
+
   def remove_member_if_empty
     if member.roles.empty?
       member.destroy

app/models/project.rb

@@ -770,7 +770,8 @@ class Project < ActiveRecord::Base
     'project_type',
     'dts_test',
     'attachmenttype',
-    'enterprise_name'
+    'enterprise_name',
+    'gpid'
      
 
 
@@ -853,6 +854,10 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def owner
+    User.find(self.user_id)
+  end
+
   private
 
   def after_parent_changed(parent_was)
@@ -1167,5 +1172,7 @@ class Project < ActiveRecord::Base
                       :forge_act_id => self.id,:forge_act_type => "ProjectCreateInfo")
    fa.save!
  end
+
+
 end
 

app/models/repository.rb

@@ -57,6 +57,11 @@ class Repository < ActiveRecord::Base
   safe_attributes 'url',
     :if => lambda {|repository, user| repository.new_record?}
 
+
+  def gitlab?
+    self.type == 'Repository::Gitlab'
+  end
+
   def repo_create_validation
     unless Setting.enabled_scm.include?(self.class.name.demodulize)
       errors.add(:type, :invalid)

app/models/role.rb

@@ -77,6 +77,27 @@ class Role < ActiveRecord::Base
     self.givable[3..5]
   end
 
+  GUEST     = 10
+  REPORTER  = 20
+  DEVELOPER = 30
+  MASTER    = 40
+  OWNER     = 50
+  def to_gitlab_role
+    case self.position
+    when 1,2
+      GUEST
+    when 5
+      REPORTER
+    when 4
+      DEVELOPER
+    when 3
+      MASTER
+    else
+      GUEST
+    end
+  end
+
+
   # Copies attributes from another role, arg can be an id or a Role
   def copy_from(arg, options={})
     return unless arg.present?

app/models/user.rb

@@ -218,6 +218,8 @@ class User < Principal
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
   after_update :update_invite_list
 
+  include  Trustie::Gitlab::ManageUser
+
   scope :in_group, lambda {|group|
     group_id = group.is_a?(Group) ? group.id : group.to_i
     where("#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
@@ -260,7 +262,7 @@ class User < Principal
     @blog = Blog.where("author_id =  #{self.id}").all[0]
     if @blog.nil?
       #如果某个user的blog不存在，那么就创建一条，并且跳转
-      @blog = Blog.create(:name=>(User.find(self.id).realname),
+      @blog = Blog.create(:name=>(User.find(self.id).realname.blank? ? User.find(self.id).login : User.find(self.id).realname ),
                                            :description=>'',
                                            :author_id=>self.id)
       @blog.save
@@ -358,7 +360,7 @@ class User < Principal
     name
   end
   ## end
-
+  
   #added by nie
   def count_new_journal_reply
     count = self.journal_reply.count
@@ -1079,6 +1081,17 @@ class User < Principal
   end
 
 
+  private
+  def sync_gitlab_user
+    user = self
+    g = Gitlab.client
+    u = g.get("/users?search=#{user.mail}").first
+    unless u
+      u = g.create_user(user.mail, user.password, name: user.show_name, username: user.login, confirm: "true")
+      self.gid = u.id
+      puts "create user #{user.login}"
+    end
+  end
 
 end
 

app/services/courses_service.rb

@@ -301,22 +301,41 @@ class CoursesService
   #@state == 5 您还未登录
   #@state == 6 申请成功，请等待审核完毕
   #@state == 7 您已经发送过申请了，请耐心等待
+  #@state == 8 您已经是该课程的教师了
+  #@state == 9 您已经是该课程的教辅了
+  #@state == 10 您已经是该课程的管理员了
   #@state 其他 未知错误，请稍后再试
   def join_course params,current_user
     course = Course.find_by_id params[:object_id]
+
     @state = 10
     if course
       if course_endTime_timeout? course
         @state = 2
       else
         if current_user.member_of_course?(course) #如果已经是成员
+          member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
+          roleName = member.roles[0].name if member
           if params[:course_password] == course.password
-            #如果加入角色为学生
-            if params[:role] == "10"
-              @state = 3
-            elsif current_user.allowed_to?(:as_teacher,course)
+            #如果加入角色为学生 并且当前是学生
+            if params[:role] == "10" && roleName == "Student"
               @state = 3
-            else
+              #如果加入的角色为老师，并且当前已经是老师
+            elsif params[:role] == "9" && roleName == "Teacher"
+              @state = 8
+              #如果加入的角色教辅并且当前为教辅
+            elsif params[:role] == "7" && roleName == "TeachingAsistant"
+              @state = 9
+              #如果加入角色是学生，但是是当前课程的教师或者教辅
+            elsif params[:role] == "10" && roleName != "Student"
+              member.role_ids = [params[:role]]
+              member.save
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              @state = 0
+            elsif roleName == "Manager"
+              @state = 10
+              #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
+            elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
               Mailer.run.join_course_request(course, User.current, params[:role])
               #如果加入角色为教师或者教辅
               CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
@@ -326,26 +345,26 @@ class CoursesService
             @state = 1
           end
         else
-          if params[:course_password] == course.password
-            if params[:role] == "10"
-              members = []
-              members << Member.new(:role_ids => [10], :user_id => current_user.id)
-              course.members << members
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
-              @state = 0
+            if params[:course_password] == course.password
+                if params[:role] == "10" || params[:role] == nil
+                  members = []
+                  members << Member.new(:role_ids => [10], :user_id => current_user.id)
+                  course.members << members
+                  StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+                  @state = 0
+                else
+                  #如果已经发送过消息了，那么就要给个提示
+                    if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
+                      @state = 7
+                    else
+                      Mailer.run.join_course_request(course, User.current, params[:role])
+                      CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                      @state = 6
+                    end
+                end
             else
-              #如果已经发送过消息了，那么就要给个提示
-              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
-                @state = 7
-              else
-                Mailer.run.join_course_request(course, User.current, params[:role])
-                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
-                @state = 6
-              end
+              @state = 1
             end
-          else
-            @state = 1
-          end
         end
       end
     else