Merge branch 'develop' into hjq_new_course

Conflicts:
	app/controllers/files_controller.rb
	db/schema.rb
处理冲突

app/assets/javascripts/shield_activities.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/shield_activities.css.scss

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

app/controllers/at_controller.rb

@@ -7,10 +7,14 @@ class AtController < ApplicationController
     @logger = Logger.new(Rails.root.join('log', 'at.log').to_s)
     users = find_at_users(params[:type], params[:id])
     @users = users
-    @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id } if users
+    @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }.sort{|x,y| to_pinyin(x.show_name) <=> to_pinyin(y.show_name)} if users
   end
 
   private
+  def to_pinyin(s)
+    Pinyin.t(s).downcase
+  end
+
   def find_at_users(type, id)
     @logger.info("#{type}, #{id}")
     case type

app/controllers/blog_comments_controller.rb

@@ -52,8 +52,12 @@ class BlogCommentsController < ApplicationController
       render_attachment_warning_if_needed(@article)
     else
     end
+    if params[:is_homepage]
+      redirect_to user_blogs_path(params[:user_id])
+    else
       redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
     end
+  end
   def destroy
     @article = BlogComment.find(params[:id])
     if @article.parent_id.nil? #如果是文章被删，那么跳转到用户博客界面，如果带了course_id过来，那么就要跳转到课程首页

app/controllers/blogs_controller.rb

@@ -1,5 +1,5 @@
 class BlogsController < ApplicationController
-  before_filter :find_blog,:except => [:index,:create,:new]
+  before_filter :find_blog,:except => [:index,:create,:new,:set_homepage, :cancel_homepage]
   before_filter :find_user
   def index
     @articls = @user.blog.articles
@@ -26,6 +26,18 @@ class BlogsController < ApplicationController
   def edit
 
   end
+
+  def set_homepage
+    @blog = Blog.find(params[:id])
+    @blog.update_attribute(:homepage_id, params[:article_id])
+    redirect_to user_blogs_path(params[:user_id])
+  end
+
+  def cancel_homepage
+    @blog = Blog.find(params[:id])
+    @blog.update_attribute(:homepage_id, nil)
+    redirect_to user_blogs_path(params[:user_id])
+  end
   private
   def find_blog
     if params[:blog_id]

app/controllers/courses_controller.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 class CoursesController < ApplicationController
   # layout 'base_courses'
   include CoursesHelper
@@ -38,15 +39,17 @@ class CoursesController < ApplicationController
     end
     limit = 15
     course_org_ids = OrgCourse.find_by_sql("select distinct organization_id from org_courses where course_id = #{params[:id]}").map(&:organization_id)
+    #@orgs_not_in_course = User.current.organizations.where("organizations.id not in (#{course_org_ids.join(',')}) and organizations.name like ?", condition).page(params[:page].to_i || 1).per(limit)
+    #@org_count = User.current.organizations.where("organizations.id not in (#{course_org_ids.join(',')}) and organizations.name like ?", condition).count
      if course_org_ids.empty?
-      @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
-      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
+       @orgs_not_in_course = User.current.organizations.where("name like ?",condition).page((params[:page].to_i || 1)).per(limit)
+       @org_count = @orgs_not_in_course.count
      else
        course_org_ids = "(" + course_org_ids.join(',') +  ")"
-      @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
-      @org_count =  Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
+       @orgs_not_in_course =  User.current.organizations.where("organizations.id not in #{course_org_ids} and organizations.name like ?", condition).page((params[:page].to_i || 1)).per(limit)
+       @org_count = @orgs_not_in_course.empty? ? 0 : @orgs_not_in_course.count
      end
-    # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
+     @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
     @orgs_page = Paginator.new @org_count, limit,params[:page]
     @hint_flag = params[:hint_flag]
     #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json
@@ -436,6 +439,73 @@ class CoursesController < ApplicationController
   def create
     cs = CoursesService.new
     @course = cs.create_course(params,User.current)[:course]
+    if params[:copy_course]
+      copy_course = Course.find params[:copy_course].to_i
+      @course.update_attributes(:open_student => copy_course.open_student, :publish_resource => copy_course.publish_resource)
+      if params[:checkAll]
+        attachments = copy_course.attachments
+        attachments.each do |attachment|
+          attach_copied_obj = attachment.copy
+          attach_copied_obj.tag_list.add(attachment.tag_list) # tag关联
+          attach_copied_obj.container = @course
+          attach_copied_obj.created_on = Time.now
+          attach_copied_obj.author_id = User.current.id
+          attach_copied_obj.copy_from = attachment.copy_from.nil? ? attachment.id : attachment.copy_from
+          if attach_copied_obj.attachtype == nil
+            attach_copied_obj.attachtype = 4
+          end
+          attach_copied_obj.save
+          update_quotes attach_copied_obj
+        end
+      elsif params[:course_attachment_type]
+        copy_attachments = []
+        params[:course_attachment_type].each do |type|
+          case type
+            when "1"
+              tag_name = l(:label_courseware)
+            when "2"
+              tag_name = l(:label_software)
+            when "3"
+              tag_name = l(:label_media)
+            when "4"
+              tag_name = l(:label_code)
+            when "6"
+              tag_name = "论文"
+            else
+              tag_name = ""
+          end
+          if tag_name == ""
+            tag_attachments = copy_course.attachments.select{|attachment|
+              !attachment.tag_list.include?('课件') &&
+                  !attachment.tag_list.include?('软件') &&
+                  !attachment.tag_list.include?('媒体') &&
+                  !attachment.tag_list.include?('代码') &&
+                  !attachment.tag_list.include?('论文')  }
+          else
+            tag_attachments = copy_course.attachments.select{|attachment| attachment.tag_list.include?(tag_name)}
+          end
+          tag_attachments.each do |attach|
+            next if copy_attachments.include?(attach)
+            copy_attachments << attach
+          end
+        end
+        unless copy_attachments.blank?
+          copy_attachments.each do |c_attach|
+            attach_copied_obj = c_attach.copy
+            attach_copied_obj.tag_list.add(c_attach.tag_list) # tag关联
+            attach_copied_obj.container = @course
+            attach_copied_obj.created_on = Time.now
+            attach_copied_obj.author_id = User.current.id
+            attach_copied_obj.copy_from = c_attach.copy_from.nil? ? c_attach.id : c_attach.copy_from
+            if attach_copied_obj.attachtype == nil
+              attach_copied_obj.attachtype = 4
+            end
+            attach_copied_obj.save
+            update_quotes attach_copied_obj
+          end
+        end
+      end
+    end
     if @course
       respond_to do |format|
         flash[:notice] = l(:notice_successful_create)
@@ -751,6 +821,11 @@ class CoursesController < ApplicationController
   #param id:已有课程ID
   def copy_course
     if @course
+      @new_course = Course.new
+      respond_to do |format|
+        format.js
+      end
+=begin
       @new_course = Course.new @course.attributes
       @new_course.tea_id = User.current.id
       @new_course.created_at = DateTime.now
@@ -769,6 +844,7 @@ class CoursesController < ApplicationController
         @new_course.course_infos << course
         redirect_to settings_course_url @new_course
       end
+=end
     else
       render_404
     end
@@ -829,6 +905,33 @@ class CoursesController < ApplicationController
   end
 
   private
+  def update_quotes attachment
+    if attachment.copy_from
+      attachments = Attachment.find_by_sql("select * from attachments where copy_from = #{attachment.copy_from} or id =  #{attachment.copy_from}")
+    else
+      attachments = Attachment.find_by_sql("select * from attachments where copy_from = #{attachment.id} or id = #{attachment.copy_from}")
+    end
+    attachment.quotes = get_qute_number attachment
+    attachment.save
+    attachments.each do |att|
+      att.quotes = attachment.quotes
+      att.save
+    end
+  end
+
+  def get_qute_number attachment
+    if attachment.copy_from
+      result = Attachment.find_by_sql("select count(*) as number from attachments where copy_from = #{attachment.copy_from}")
+    else
+      result = Attachment.find_by_sql("select count(*) as number from attachments where copy_from = #{attachment.id}")
+    end
+    if result.nil? || result.count <= 0
+      return 0
+    else
+      return result[0].number
+    end
+  end
+
   def allow_join course
     if course_endTime_timeout? course
       respond_to do |format|

app/controllers/exercise_controller.rb

@@ -376,6 +376,11 @@ class ExerciseController < ApplicationController
     end
     respond_to do |format|
       format.html
+      format.xls {
+        filename = "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@exercise.exercise_name}#{l(:excel_exercise_list)}.xls"
+        send_data(exercise_to_xls(@exercise_users_list), :type => "text/excel;charset=utf-8; header=present",
+                  :filename => filename_for_content_disposition(filename))
+      }
     end
   end
 
@@ -603,6 +608,29 @@ class ExerciseController < ApplicationController
   end
 
   private
+  #测验列表转换为excel
+  def exercise_to_xls items
+    xls_report = StringIO.new
+    book = Spreadsheet::Workbook.new
+    sheet1 = book.create_worksheet :name => "exercise"
+    blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
+    sheet1.row(0).default_format = blue
+    sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_class),l(:excel_f_score),l(:excel_commit_time)])
+    count_row = 1
+    items.each do |exercise|
+      sheet1[count_row,0]=exercise.user.id
+      sheet1[count_row,1] = exercise.user.lastname.to_s + exercise.user.firstname.to_s
+      sheet1[count_row,2] = exercise.user.login
+      sheet1[count_row,3] = exercise.user.user_extensions.student_id
+      sheet1[count_row,4] = exercise.user.mail
+      sheet1[count_row,5] = ""
+      sheet1[count_row,6] = exercise.score
+      sheet1[count_row,7] = format_time(exercise.created_at)
+      count_row += 1
+    end
+    book.write xls_report
+    xls_report.string
+  end
 
   # ExerciseUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个
   def get_exercise_user exercise_id,user_id

app/controllers/files_controller.rb

@@ -23,8 +23,10 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file,
-                                           :search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,
+                                        :search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,
+                                        :search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,
+                                        :search_files_in_subfield,:upload_files_menu]
 
   helper :sort
   include SortHelper
@@ -227,6 +229,7 @@ class FilesController < ApplicationController
     @order = ""
     @is_remote = false
     if params[:project_id]
+      @page = params[:page] ? params[:page].to_i + 1 : 2
       @container_type = 0
       if params[:sort]
         params[:sort].split(",").each do |sort_type|
@@ -822,4 +825,8 @@ class FilesController < ApplicationController
   def subfield_upload_file
     @org_subfield = OrgSubfield.find(params[:org_subfield_id])
   end
+
+  def upload_files_menu
+
+end
 end

app/controllers/issues_controller.rb

@@ -412,6 +412,7 @@ class IssuesController < ApplicationController
       if params[:issue_id]
         @issue_id = params[:issue_id]
       end
+      @priorities = IssuePriority.active
       respond_to do |format|
         format.js
       end

app/controllers/organizations_controller.rb

@@ -28,7 +28,7 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
-  before_filter :find_organization, :only => [:show, :members]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain]
   layout 'base_org'
   def index
 
@@ -73,8 +73,10 @@ class OrganizationsController < ApplicationController
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
         @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
       else
-        project_ids = @organization.projects.map(&:id) << 0
-        course_ids = @organization.courses.map(&:id) << 0
+        shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
+        shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
+        project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
+        course_ids = (@organization.courses.map(&:id)-shield_course_ids) << 0
         course_types = "('Message','News','HomeworkCommon','Poll','Course')"
         case params[:type]
           when nil
@@ -98,7 +100,7 @@ class OrganizationsController < ApplicationController
             @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
         end
       end
-      @page = params[:page]
+      @page = params[:page] ? params[:page].to_i : 1
       respond_to do |format|
         format.html
         format.js
@@ -299,5 +301,19 @@ class OrganizationsController < ApplicationController
       format.js
     end
   end
+  def apply_subdomain
+    @organization = Organization.find(params[:id])
+    admins = User.where("admin=1")
+    admins.each do |admin|
+      OrgMessage.create(:user_id => admin.id, :organization_id => @organization.id, :message_type => 'ApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:domain])
+    end
+  end
 
+  def agree_apply_subdomain
+    @organization = Organization.find(params[:organization_id])
+    @organization.update_attribute(:domain, params[:org_domain])
+    if OrgMessage.where("message_type='AgreeApplySubdomain' and organization_id=#{@organization.id} and content=?",params[:org_domain]).count == 0
+      OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
+    end
+  end
 end

app/controllers/projects_controller.rb

@@ -76,16 +76,17 @@ class ProjectsController < ApplicationController
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
     limit = 15
-    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id)
-    if project_org_ids.empty?
-      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
-      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
-    else
-      project_org_ids = "(" + project_org_ids.join(',') +  ")"
-      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
-      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
-    end
-   # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
+    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) << 0
+    @orgs_not_in_project = User.current.organizations.where("organizations.id not in (#{project_org_ids.join(',')}) and organizations.name like ?", condition).page(params[:page].to_i || 1).per(limit)
+    @org_count = User.current.organizations.where("organizations.id not in (#{project_org_ids.join(',')}) and organizations.name like '#{condition}'").count
+    # if project_org_ids.empty?
+    #   @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
+    #   @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
+    # else
+    #   project_org_ids = "(" + project_org_ids.join(',') +  ")"
+    #   @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
+    #   @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
+    # end
     @orgs_page = Paginator.new @org_count, limit,params[:page]
     @no_roll_hint = params[:hint_flag]
     #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json

app/controllers/repositories_controller.rb

@@ -357,7 +357,7 @@ update
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_all_count = @project.gpid.nil? ? 0 : g.commits_total_count(@project.gpid).count
+      @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count
       @changesets_latest_coimmit = @changesets[0]
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories

app/controllers/shield_activities_controller.rb

@@ -0,0 +1,43 @@
+class ShieldActivitiesController < ApplicationController
+  def create
+    if params[:org_id]
+      if params[:project_id]
+        ShieldActivity.create(:container_type => 'Organization', :container_id => params[:org_id].to_i, :shield_type => 'Project', :shield_id => params[:project_id].to_i)
+      elsif params[:course_id]
+        ShieldActivity.create(:container_type => 'Organization', :container_id => params[:org_id].to_i, :shield_type => 'Course', :shield_id => params[:course_id].to_i)
+      end
+    elsif params[:user_id]
+      if params[:project_id]
+        ShieldActivity.create(:container_type => 'User', :container_id => params[:user_id].to_i, :shield_type => 'Project', :shield_id => params[:project_id].to_i)
+      elsif params[:course_id]
+        ShieldActivity.create(:container_type => 'User', :container_id => params[:user_id].to_i, :shield_type => 'Course', :shield_id => params[:course_id].to_i)
+      end
+    end
+  end
+
+  def show_acts
+    if params[:org_id]
+      if params[:project_id]
+        ShieldActivity.where("container_type='Organization' and container_id=#{params[:org_id].to_i} and shield_type='Project' and shield_id=#{params[:project_id]}").each do |act|
+          act.destroy
+        end
+        # ShieldActivity.create(:container_type => 'Organization', :container_id => params[:org_id].to_i, :shield_type => 'Project', :shield_id => params[:project_id].to_i)
+      elsif params[:course_id]
+        ShieldActivity.where("container_type='Organization' and container_id=#{params[:org_id].to_i} and shield_type='Course' and shield_id=#{params[:course_id]}").each do |act|
+          act.destroy
+        end
+      end
+    elsif params[:user_id]
+      if params[:project_id]
+        ShieldActivity.where("container_type='User' and container_id=#{params[:user_id].to_i} and shield_type='Project' and shield_id=#{params[:project_id]}").each do |act|
+          act.destroy
+        end
+        # ShieldActivity.create(:container_type => 'Organization', :container_id => params[:org_id].to_i, :shield_type => 'Project', :shield_id => params[:project_id].to_i)
+      elsif params[:course_id]
+        ShieldActivity.where("container_type='User' and container_id=#{params[:user_id].to_i} and shield_type='Course' and shield_id=#{params[:course_id]}").each do |act|
+          act.destroy
+        end
+      end
+    end
+  end
+end

app/controllers/users_controller.rb

@@ -967,9 +967,11 @@ class UsersController < ApplicationController
                                                  params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
       join_course_messages.update_all(:viewed => true)
     end
+    shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+    shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
     @page = params[:page] ? params[:page].to_i + 1 : 0
-    user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
-    user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+    user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+    user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course')"
     project_types = "('Message','Issue','ProjectCreateInfo')"
     principal_types = "JournalsForMessage"

app/controllers/words_controller.rb

@@ -236,8 +236,12 @@ class WordsController < ApplicationController
     if User.current.logged?
       @user = User.find(params[:id])
       if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+        if params[:private] && params[:private] == '1'
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:user_message], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+        else
           @user.add_jour(User.current, params[:new_form][:user_message])
         end
+      end
       redirect_to feedback_path(@user)
     else
       render_403

app/helpers/application_helper.rb

@@ -59,6 +59,19 @@ module ApplicationHelper
     end
   end
 
+  # 判断组织左侧展开或者隐藏
+  def is_hide_org_left obj
+    if obj.nil?
+      return true
+    else
+      if obj.hide == 0
+        return true
+      else
+        return false
+      end
+    end
+  end
+
   # Time 2015-03-24 16:38:05
   # Author lizanle
   # Description after save后需要进行资源记录的更新
@@ -2768,4 +2781,10 @@ int main(int argc, char** argv){
     ss.html_safe
   end
 
+  #代码提交数量
+  def changesets_num project
+    g = Gitlab.client
+    project.gpid.nil? ? 0 : g.project(project.gpid).commit_count
+    # project.changesets.count
+  end
 end

app/helpers/project_score_helper.rb

@@ -20,14 +20,6 @@ module ProjectScoreHelper
     project.documents.count
   end
 
-  #代码提交数量
-  def changesets_num project
-    g = Gitlab.client
-    project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count
-    # # commits_total_count(project.gpid)
-    # project.changesets.count
-  end
-
   #讨论区帖子数量
   def board_message_num project
     board_message_count = 0

app/helpers/shield_activities_helper.rb

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

app/helpers/users_helper.rb

@@ -591,7 +591,7 @@ module UsersHelper
     option << "请选择发布作业的课程"
     option << -1
     type << option
-    user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
+    user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
       option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id

app/models/journals_for_message.rb

@@ -15,8 +15,9 @@ class JournalsForMessage < ActiveRecord::Base
                   "m_parent_id", # 留言信息的父留言id
                     "is_readed", # 留言是否已读
                 "m_reply_count", # 留言的回复数量
-                  "m_reply_id"   # 回复某留言的留言id(a留言回复了b留言，这是b留言的id)
-               "is_comprehensive_evaluation"  # 1 教师评论、2 匿评、3 留言
+                  "m_reply_id" ,  # 回复某留言的留言id(a留言回复了b留言，这是b留言的id)
+               "is_comprehensive_evaluation",  # 1 教师评论、2 匿评、3 留言
+              "private"
   acts_as_tree :foreign_key => 'm_parent_id', :counter_cache => :m_reply_count, :order => "#{JournalsForMessage.table_name}.created_on ASC"
   after_destroy :delete_kindeditor_assets
   belongs_to :project,

app/models/org_message.rb

@@ -0,0 +1,15 @@
+class OrgMessage < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :organization
+  has_many :message_alls, :as => :message, :dependent => :destroy
+  validates :message_type, :presence => true
+  validates :message_id, :presence => true
+  validates :organization_id, :presence => true
+  after_create :add_user_message
+
+  def add_user_message
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
+  end
+end

app/models/shield_activity.rb

@@ -0,0 +1,3 @@
+class ShieldActivity < ActiveRecord::Base
+
+end

app/services/courses_service.rb

@@ -193,6 +193,7 @@ class CoursesService
       @course.extra = 'course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
       @course.send(:safe_attributes=, params[:course], current_user)
       #@course.safe_attributes(current_user,params[:course])
+      @course.password = params[:course][:password]
       @course.tea_id = current_user.id
       @course.term = params[:term]
       @course.time = params[:time]

app/views/attachments/_activity_attach.html.erb

@@ -0,0 +1,19 @@
+<% if activity.attachments.any? %>
+    <% activity.attachments.each do |attachment| %>
+        <div class="break_word">
+          <span class="fl">
+          <span title="<%= attachment.filename %>" id="attachment_<%=attachment.id %>">
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'mw400 hidden link_file_a fl newsBlue', :download => true -%>
+          </span>
+          </span>
+          <span class="postAttSize">(
+            <%= number_to_human_size attachment.filesize %>)
+          </span>
+          <span class="author" title="<%= attachment.author%>">
+            <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+            <%= format_time(attachment.created_on) %>
+          </span>
+        </div>
+        <div class="cl"></div>
+    <% end %>
+<% end %>

app/views/blog_comments/edit.html.erb

@@ -1,5 +1,5 @@
 <% if User.current.logged? && User.current.id == @user.id %>
-    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id},:method=>'PUT',
+    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage]},:method=>'PUT',
                           :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
         <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
     <% end %>