merge

Gemfile

@@ -18,7 +18,7 @@ gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
 gem 'seems_rateable', '~> 1.0.13'
-gem 'rails', '~> 3.2', '>= 3.2.22'
+gem 'rails', '~> 3.2'
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem 'coderay', '~> 1.1.0'

app/controllers/admin_controller.rb

@@ -32,23 +32,60 @@ class AdminController < ApplicationController
   end
 
   def projects
+=begin
     @status = params[:status] || 1
 
-    scope = Project.status(@status).order('id asc')
+    scope = Project.status(@status)
     scope = scope.like(params[:name]) if params[:name].present?
-    @projects = scope.where(project_type: Project::ProjectType_project).all
-
+    @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all
+=end
+    @projects = Project.like(@name).order('created_on desc')
+    @projects = paginateHelper @projects,30
+    @page = (params['page'] || 1).to_i - 1
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def courses
     @name = params[:name]
-    @courses = Course.like(@name)
+    @courses = Course.like(@name).order('created_at desc')
+    @courses = paginateHelper @courses,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #管理员界面精品课程列表
+  def excellent_courses
+    @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
     respond_to do |format|
       format.html
     end
   end
 
+ #管理员界面课程资源列表
+  def course_resource_list
+    @resource = Attachment.where(:container_type => 'Course')
+    @resource = paginateHelper @resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #管理员界面項目资源列表
+  def project_resource_list
+    @pro_resource = Attachment.where(:container_type => 'Project')
+    @pro_resource = paginateHelper @pro_resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+
   def users
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)

app/controllers/at_controller.rb

@@ -8,6 +8,15 @@ class AtController < ApplicationController
     users = find_at_users(params[:type], params[:id])
     @users = 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
+
+    #加上all
+    if @users.size > 0
+      allUser = Struct.new(:id, :name).new
+      allUser.id = @users.map{|u| u.id}.join(",")
+      allUser.name = "all"
+      @users.insert(0, allUser)
+    end
+    @users
   end
 
   private

app/controllers/attachments_controller.rb

@@ -103,6 +103,9 @@ class AttachmentsController < ApplicationController
             direct_download_history
           end
         else
+          # 记录用户行为
+          record_user_actions(params[:id])
+          # 直接下载历史版本
           direct_download_history
         end
       end
@@ -113,6 +116,14 @@ class AttachmentsController < ApplicationController
     redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
   end
 
+  def record_user_actions id
+    if params[:action] == "download_history"
+      UserActions.create(:action_id => id, :action_type => "AttachmentHistory", :user_id => User.current.id) unless id.nil?
+    elsif params[:action] == "download"
+      UserActions.create(:action_id => id, :action_type => "Attachment", :user_id => User.current.id) unless id.nil?
+    end
+  end
+
   def download
     # modify by nwb
     # 下载添加权限设置
@@ -135,6 +146,8 @@ class AttachmentsController < ApplicationController
             direct_download
           end
         else
+          # 记录用户行为
+          record_user_actions(params[:id])
           direct_download
         end
       end
@@ -251,7 +264,7 @@ class AttachmentsController < ApplicationController
       @history.version =  @old_history.nil? ? 1 :  @old_history.version + 1
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
-      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads")
+      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes")
       @old_attachment.save
       #删除当前记录
       @attachment.delete
@@ -572,6 +585,15 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #找到文件的所有的历史版本及当前版本
+  def attachment_history_download
+    @attachment = Attachment.find(params[:id])
+    @attachment_histories = @attachment.attachment_histories
+    respond_to do |format|
+      format.js
+    end
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])

app/controllers/blog_comments_controller.rb

@@ -91,8 +91,12 @@ class BlogCommentsController < ApplicationController
 
   def edit
     @article = BlogComment.find(params[:id])
-    respond_to do |format|
-      format.html {render :layout=>'new_base_user'}
+    if User.current.admin? || User.current.id == @article.author_id
+      respond_to do |format|
+        format.html { render :layout => 'new_base_user' }
+      end
+    else
+      render_403
     end
   end
 

app/controllers/blogs_controller.rb

@@ -29,7 +29,7 @@ class BlogsController < ApplicationController
   def set_homepage
     @blog = Blog.find(params[:id])
     @blog.update_attribute(:homepage_id, params[:article_id])
-    redirect_to user_blogs_path(params[:user_id])
+    redirect_to user_path(params[:user_id])
   end
 
   def cancel_homepage

app/controllers/courses_controller.rb

@@ -7,6 +7,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
   helper :attachments
+  helper :files
   helper :activity_notifys
 
   before_filter :auth_login1, :only => [:show, :course_activity, :feedback]
@@ -240,6 +241,18 @@ class CoursesController < ApplicationController
     # req[:message] = l(:modal_valid_passing) if req[:message].blank?
     render :json => req
   end
+
+  def teacher_assign_group
+    member = Member.where(:course_id => @course.id, :user_id => params[:user_id]).first
+    member.course_group_id = params[:course_group_id].to_i
+    member.save
+    @course_groups = @course.course_groups
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def join_group
     @subPage_title = l :label_student_list
     group = CourseGroup.find(params[:object_id])
@@ -838,6 +851,8 @@ class CoursesController < ApplicationController
     #   render_403
     #   return
     # end
+    # 统计访问量
+    @course.update_attribute(:visits, @course.visits.to_i + 1)
     #更新创建课程消息状态
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)
@@ -888,10 +903,7 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-    @course.journals_for_messages.each do |messages|
-      query = messages.course_messages.where("user_id = ?", User.current.id)
-      query.update_all(:viewed => true);
-    end
+    CourseMessage.where("user_id = ? and course_id = ?", User.current, @course.id).update_all(:viewed => true)
 
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
@@ -1067,7 +1079,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -1079,7 +1091,7 @@ class CoursesController < ApplicationController
         WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}

app/controllers/files_controller.rb

@@ -207,8 +207,7 @@ class FilesController < ApplicationController
       sort =  "created_on DESC"
     end
     if keywords != "%%"
-    resultSet = Attachment.where("attachments.container_type = 'Course' And attachments.container_id = '#{course.id}' AND filename LIKE :like ", like: "%#{keywords}%").
-        reorder(sort)
+    resultSet = Attachment.where("attachments.container_type = 'Course' And attachments.container_id = '#{course.id}' AND filename LIKE :like ", like: "%#{keywords}%").reorder(sort)
     else
       resultSet = Attachment.where("attachments.container_type = 'Course' And attachments.container_id = '#{course.id}' "). reorder(sort)
     end
@@ -406,10 +405,14 @@ class FilesController < ApplicationController
       @container_type = 2
       @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
       @organization = Organization.find(@containers.first.organization_id)
-      show_attachments @containers
-      @tag_list = attachment_tag_list @all_attachments
-      @page = params[:page] || 1
-      render :layout => 'base_org'
+      if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
+        show_attachments @containers
+        @tag_list = attachment_tag_list @all_attachments
+        @page = params[:page] || 1
+        render :layout => 'base_org'
+      else
+        render_403
+      end
       # @subfield = params[:org_subfield_id]
     end
 
@@ -529,6 +532,7 @@ class FilesController < ApplicationController
            if attachment.publish_time > Date.today
              attachment.is_publish = 0
            end
+           attachment.description = params[:description]
            attachment.save
          end
        end
@@ -554,7 +558,8 @@ class FilesController < ApplicationController
          end
        end
        # 更新课程英雄榜得分
-       update_contributor_score(@course, attachments[:files].first)
+       course_member_score(@course.id, attachments[:files].first.author_id, "Attachment")
+       # end
        # end
        # TODO: 临时用 nyan
        sort_init 'created_on', 'desc'
@@ -627,20 +632,6 @@ class FilesController < ApplicationController
    end
   end
 
-  def update_contributor_score(course, file )
-    unless  file.author.allowed_to?(:as_teacher, course)
-      course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id,  file.author.id).first
-      if  course_contributor_score.nil?
-        CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0,
-                                      :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5)
-      else
-        score = course_contributor_score.resource_num + 5
-        total_score = course_contributor_score.total_score + 5
-        course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score)
-      end
-    end
-  end
-
   def get_project_tag_name_by_type_nmuber type
     case type
       when "1"
@@ -860,7 +851,13 @@ class FilesController < ApplicationController
     q = "%#{@q.strip}%"
     @result = find_org_subfield_attache q,@org_subfield,sort
     @result = visable_attachemnts @result
-    @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    if params[:other]
+      @result = @result.select{|attachment|
+        attachment.tag_list.index{|tag|tag != '软件' and tag != '媒体' and tag != '代码'}.present?
+      }
+    else
+      @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    end
     @searched_attach = paginateHelper @result,10
     @tag_list = get_org_subfield_tag_list @org_subfield
 

app/controllers/homework_common_controller.rb

@@ -51,8 +51,14 @@ class HomeworkCommonController < ApplicationController
     @user = User.current
     @is_in_course = params[:is_in_course].to_i
     @course_activity = params[:course_activity].to_i
-    respond_to do |format|
-      format.html{render :layout => 'new_base_user'}
+    if @is_in_course == 1 || @course_activity == 1
+      respond_to do |format|
+        format.html{render :layout => 'base_courses'}
+      end
+    else
+      respond_to do |format|
+        format.html{render :layout => 'new_base_user'}
+      end
     end
   end
 
@@ -73,9 +79,11 @@ class HomeworkCommonController < ApplicationController
       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]
-
+      eval_start = homework_detail_manual.evaluation_start
+      if eval_start <= @homework.end_time && homework_detail_manual.comment_status <= 1
+        homework_detail_manual.evaluation_start = @homework.end_time + 7
+        homework_detail_manual.evaluation_end = homework_detail_manual.evaluation_start + 7
+      end
       @homework.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@homework)
 

app/controllers/issues_controller.rb

@@ -118,6 +118,9 @@ class IssuesController < ApplicationController
   end
 
   def show
+    # 打开编辑内容
+    @is_edit = true unless params[:edit].nil?
+
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
     query.update_attribute(:viewed, true) unless query.nil?
@@ -387,6 +390,9 @@ class IssuesController < ApplicationController
   end
 
   def destroy
+    # 增加删除页面类型，如果是个人主页，则返回该主页，项目动态则返回项目动态页眉
+    page_classify = params[:page_classify] unless params[:page_classify].nil?
+    page_id = params[:page_id] unless params[:page_id].nil?
     @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
     if @hours > 0
       case params[:todo]
@@ -415,7 +421,11 @@ class IssuesController < ApplicationController
       end
     end
     respond_to do |format|
-      format.html { redirect_back_or_default _project_issues_path(@project) }
+      if page_classify
+        format.html { redirect_back_or_default _project_issues_path(@project, page_classify, page_id) }
+      else
+        format.html { redirect_back_or_default _project_issues_path(@project) }
+      end
       format.api  { render_api_ok }
     end
   end

app/controllers/news_controller.rb

@@ -107,32 +107,18 @@ class NewsController < ApplicationController
 
   def show
     # 更新news对应的forge_messages的消息viewed字段
+    ids = @news.comments.map { |comment| comment.id }.join(",") unless @news.comments.nil?
     if @project
-      query_message_news = @news.forge_messages
+      # 更新新闻
+      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      # 更新新闻的时候一并更新回复
+      ForgeMessage.where("forge_message_id in (#{ids}) and forge_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     else
-      query_message_news = @news.course_messages
+      query_message_news = CourseMessage.where("course_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      CourseMessage.where("course_message_id in (#{ids}) and course_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     end
-    query_message_news.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-    end
-    # 更新项目新闻的评阅的消息viewed字段
-    current_message_comments = @news.comments
-    current_message_comments.each do |current_message_comment|
-    if @project
-      query_message_comment = current_message_comment.forge_messages
-    else
-      query_message_comment = current_message_comment.course_messages
-    end
-    query_message_comment.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-      end
-    end
-    # end
-
+    query_message_news.update_attribute(:viewed, true) unless query_message_news.nil?
+    # over
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

app/controllers/org_document_comments_controller.rb

@@ -1,6 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-  helper :attachments
+  helper :attachments,:organizations
   layout 'base_org'
 
   def new

app/controllers/org_subfields_controller.rb

@@ -5,9 +5,8 @@ class OrgSubfieldsController < ApplicationController
   def create
     if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0
       @res = true
-      @subfield = OrgSubfield.create(:name => params[:name])
       @organization = Organization.find(params[:organization_id])
-      @organization.org_subfields << @subfield
+      @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id],:priority => @organization.org_subfields.order("priority").last.priority + 1)
       if !params[:sub_dir].blank?
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
               "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
@@ -15,7 +14,7 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir])
         end
       end
-      @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
+      @subfield.update_attributes(:field_type => params[:field_type])
     else
       @res = false
     end
@@ -33,61 +32,65 @@ class OrgSubfieldsController < ApplicationController
       domain = Secdomain.where("subname=?", request.subdomain).first
       @organization = Organization.find(domain.pid)
     end
-    @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
-        "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
-        " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
-    if @org_subfield.field_type == 'Post'
+    if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
+      @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
+                                                  "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
+                                                  " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
+      if @org_subfield.field_type == 'Post'
         @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)
         #redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id)
-    else
-      if params[:sort]
-        params[:sort].split(",").each do |sort_type|
-          order_by = sort_type.split(":")
-          case order_by[0]
-            when "filename"
-              attribute = "filename"
-            when "size"
-              attribute = "filesize"
-            when "attach_type"
-              attribute = "attachtype"
-            when "content_type"
-              attribute = "created_on"
-            when "field_file_dense"
-              attribute = "is_public"
-            when "downloads"
-              attribute = "downloads"
-            when "created_on"
-              attribute = "created_on"
-            when "quotes"
-              attribute = "quotes"
-            else
-              attribute = "created_on"
-          end
-          @sort = order_by[0]
-          @order = order_by[1]
-          if order_by.count == 1 && attribute
-            sort += "#{Attachment.table_name}.#{attribute} asc "
-            if sort_type != params[:sort].split(",").last
-              sort += ","
+      else
+        if params[:sort]
+          params[:sort].split(",").each do |sort_type|
+            order_by = sort_type.split(":")
+            case order_by[0]
+              when "filename"
+                attribute = "filename"
+              when "size"
+                attribute = "filesize"
+              when "attach_type"
+                attribute = "attachtype"
+              when "content_type"
+                attribute = "created_on"
+              when "field_file_dense"
+                attribute = "is_public"
+              when "downloads"
+                attribute = "downloads"
+              when "created_on"
+                attribute = "created_on"
+              when "quotes"
+                attribute = "quotes"
+              else
+                attribute = "created_on"
             end
-          elsif order_by.count == 2 && order_by[1]
-            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
-            if sort_type != params[:sort].split(",").last
-              sort += ","
+            @sort = order_by[0]
+            @order = order_by[1]
+            if order_by.count == 1 && attribute
+              sort += "#{Attachment.table_name}.#{attribute} asc "
+              if sort_type != params[:sort].split(",").last
+                sort += ","
+              end
+            elsif order_by.count == 2 && order_by[1]
+              sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+              if sort_type != params[:sort].split(",").last
+                sort += ","
+              end
             end
           end
+        else
+          sort = "#{Attachment.table_name}.created_on desc"
         end
-      else
-        sort = "#{Attachment.table_name}.created_on desc"
+        @container_type = 2
+        @containers = [OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+        @organization = Organization.find(@containers.first.organization_id)
+        show_attachments @containers
+        @tag_list = attachment_tag_list @all_attachments
       end
-      @container_type = 2
-      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
-      @organization = Organization.find(@containers.first.organization_id)
-      show_attachments @containers
-      @tag_list = attachment_tag_list @all_attachments
+      @page = params[:page] || 1
+    else
+      render_403
     end
-    @page = params[:page] || 1
     #render :layout => 'base_org'
   end
 
@@ -121,6 +124,12 @@ class OrgSubfieldsController < ApplicationController
     end
   end
 
+  def update_priority
+    @org_subfield = OrgSubfield.find(params[:id])
+    @org_subfield.update_attribute(:priority, params[:priority].to_i)
+    @organization = @org_subfield.organization
+  end
+
   def show_attachments obj
     @attachments = []
     obj.each do |container|

app/controllers/organizations_controller.rb

@@ -69,6 +69,8 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
+      # 统计访问量
+      @organization.update_attribute(:visits, @organization.visits.to_i + 1)
       if params[:org_subfield_id]
         @org_subfield = OrgSubfield.find(params[:org_subfield_id])
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
@@ -315,7 +317,7 @@ class OrganizationsController < ApplicationController
     @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])
+      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].downcase)
     end
   end
 

app/controllers/projects_controller.rb

@@ -66,6 +66,7 @@ class ProjectsController < ApplicationController
   helper :words
   helper :project_score
   helper :user_score
+  include UsersHelper
   ### added by william
   include ActsAsTaggableOn::TagsHelper
 
@@ -297,66 +298,29 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
-=begin
-    cond = @project.project_condition(Setting.display_subprojects_issues?)
-    has = {
-      "show_issues" => true ,
-      "show_files" => true,
-      "show_documents" => true,
-      "show_messages" => true,
-      "show_news" => true,
-      "show_bids" => true,
-      "show_contests" => true,
-      "show_wiki_edits"=>true,
-      "show_journals_for_messages" => true
-    }
-    # 读取项目默认展示的动态时间天数
-    @days = Setting.activity_days_default.to_i
-    @date_to ||= Date.today + 1
-    # 时间跨度不能太大，不然很慢，所以删掉了-1.years
-    @date_from = @date_to - @days
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-=end
-
+    # 统计访问量
+    @project.update_attribute(:visits, @project.visits.to_i + 1)
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
-    # 决定显示所用用户或单个用户活动
-=begin
-    @activity = Redmine::Activity::Fetcher.new(User.current,
-                                                   :project => @project,
-                                                   :with_subprojects => @with_subprojects,
-                                                   :author => @author)
-    @activity.scope_select {|t| !has["show_#{t}"].nil?}
-=end
-
     @page = params[:page] ? params[:page].to_i + 1 : 0
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
       case params[:type]
         when nil
-          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10)
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'issue'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'news'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'message'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'attachment'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Attachment'",@project).order("updated_at desc").limit(10).offset(@page * 10)
       end
-
-      #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public
                                                     = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc")
                                                           .page(params['page'|| 1]).per(10);
-     # @events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
-
-=begin
-    @events_pages = Paginator.new events.count, 10, params['page']
-    # 总的数据中取出某一页
-    events = events.slice(@events_pages.offset,10)
-    # 按天分组
-    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-=end
     boards = @project.boards.includes(:last_message => :author).all
     @topic_count = @project.boards.count
     # 根据对应的请求，返回对应的数据
@@ -405,11 +369,17 @@ class ProjectsController < ApplicationController
       end
       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)
-      @repository.is_default = @project.repository.nil?
-      @repository.project = @project
-
+    # for：设置默认分支
+    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
+    @repository = Repository.factory(scm)
+    @repository.is_default = @project.repository.nil?
+    @repository.project = @project
+    unless @project.gpid.nil?
+      g = Gitlab.client
+      @gitlab_branches = g.branches(@project.gpid)
+      @branch_names = g.branches(@project.gpid).map{|b| b.name}
+      @gitlab_default_branch = g.project(@project.gpid).default_branch
+    end
   end
 
   # 项目邀请用户加入实现过程
@@ -670,8 +640,7 @@ class ProjectsController < ApplicationController
     # 更新公开私有时同步gitlab公开私有
     unless @project.gpid.nil?
       g = Gitlab.client
-      gproject = g.project(@project.gpid)
-      params[:project][:is_public] ? g.edit_project(gproject.id, 20) : g.edit_project(gproject.id, 0)
+      params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
     end
     # end
     if validate_parent_id && @project.save

app/controllers/repositories_controller.rb

@@ -140,7 +140,7 @@ class RepositoriesController < ApplicationController
             attrs = {:parent_id => project.parent_id}.reject {|k,v| v.nil?}
             redirect_to new_project_url(attrs, :course => '0')
           else
-            redirect_to settings_project_url(project)
+            redirect_to project_path(project)
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => project.id) }
@@ -431,7 +431,10 @@ update
 
   def entry
     entry_and_raw(false)
-    render :layout => 'base_projects'
+    @content = @repository.cat(@path, @rev)
+    if is_entry_text_data?(@content, @path)
+      render :layout => 'base_projects'
+    end
   end
 
   def entry_and_raw(is_raw)
@@ -443,9 +446,7 @@ update
 
     @content = @repository.cat(@path, @rev)
     (show_error_not_found; return) unless @content
-    if is_raw ||
-        (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
-        ! is_entry_text_data?(@content, @path)
+    if is_raw || (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) || !is_entry_text_data?(@content, @path)
       # Force the download
       send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
       send_type = Redmine::MimeType.of(@path)
@@ -633,9 +634,10 @@ update
     end
     (render_404; return false) unless @repository
     @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
-    @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip
+    # gitlab端获取默认分支
+    gitlab_branchs = $g.project(@project.gpid).default_branch
+    @project.gpid.nil? ? (@rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip) : (@rev = params[:rev].blank? ? gitlab_branchs : params[:rev].to_s.strip)
     @rev_to = params[:rev_to]
-
     unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE)
       if @repository.branches.blank?
         raise InvalidRevisionParam

app/controllers/student_work_controller.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 class StudentWorkController < ApplicationController
   layout "base_courses"
   include StudentWorkHelper
@@ -36,6 +37,14 @@ class StudentWorkController < ApplicationController
           unless student_work.save
             resultObj[:status] = 200
           else
+            student_work.name = params[:title]
+            student_work.description = params[:src]
+            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
+            else
+              student_work.late_penalty = 0
+            end
+            student_work.save
             resultObj[:status] = result["status"].to_i
             resultObj[:time] = student_work_test.created_at.to_s(:db)
             resultObj[:index] = student_work.student_work_tests.count
@@ -91,25 +100,27 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if @homework.is_open == 1
-        @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").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+      #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        if @order == 'lastname'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+        elsif @order == 'student_id'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @is_teacher || @homework.homework_detail_manual.nil? ||
-            (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
-          @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").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-          @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -129,15 +140,21 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
-            @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").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+            else
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else
@@ -148,25 +165,28 @@ class StudentWorkController < ApplicationController
         return
       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
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, 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 @homework.is_open == 1
-        @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
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        if @order == 'lastname'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+        elsif @order == 'student_id'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
-          @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
-          @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -186,15 +206,21 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
-            @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
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+            else
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else
@@ -205,7 +231,7 @@ class StudentWorkController < ApplicationController
         return
       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
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -257,7 +283,7 @@ class StudentWorkController < ApplicationController
       @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
       student_work ||= StudentWork.new
-      student_work.name = params[:student_work][:name]
+      student_work.name = params[:student_work][:name] == "#{@homework.name}的作品提交(可修改)" ? "#{@homework.name}的作品提交" : params[:student_work][:name]
       student_work.description = params[:student_work][:description]
       student_work.homework_common_id = @homework.id
       student_work.user_id = User.current.id
@@ -303,6 +329,7 @@ class StudentWorkController < ApplicationController
             stu_project.save
           end
         end
+        @homework.update_attributes(:updated_at => Time.now)
         update_course_activity(@homework.class,@homework.id)
         update_user_activity(@homework.class,@homework.id)
         update_org_activity(@homework.class,@homework.id)
@@ -500,6 +527,10 @@ class StudentWorkController < ApplicationController
         when 3 #学生评分 学生评分显示平均分
           @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
       end
+      @homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(@homework.class,@homework.id)
+      update_user_activity(@homework.class,@homework.id)
+      update_org_activity(@homework.class,@homework.id)
       if @work.save
         respond_to do |format|
           format.js

app/controllers/words_controller.rb

@@ -276,7 +276,7 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-
+          @homework_common.update_attributes(:updated_at => Time.now)
           update_course_activity(@homework_common.class,@homework_common.id)
           update_user_activity(@homework_common.class,@homework_common.id)
           update_org_activity(@homework_common.class,@homework_common.id)

app/helpers/courses_helper.rb

@@ -25,7 +25,7 @@ module CoursesHelper
     # 获取tag匹配结果ID
     a_tags = []
     # kc = keywords.to_a
-    Course.visible.where("is_excellent =?", 1).each do |ec|
+    Course.visible.where("is_excellent =? and is_public =?", 1, 1).each do |ec|
       if ec.tags.any?{|value| current_course.name.include?(value.to_s)}
         a_tags << ec.id
       end
@@ -44,7 +44,7 @@ module CoursesHelper
     excellent_ids = a_courses.flatten.uniq.delete_if{|i| i == current_course.id}
     limit = 5 - excellent_ids.length.to_i
     sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id
-         and c.is_excellent =1 and c.id != #{current_course.id} order by cs.updated_at desc;"
+         and c.is_excellent =1 and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;"
     default_ecourse_ids = Course.find_by_sql(sql).flatten
     # REDO:时间紧，待优化
     default_ids =[]
@@ -71,6 +71,11 @@ module CoursesHelper
     project.members.count
   end
 
+  # 统计课程中作品的数量
+  def student_works_num course
+    StudentWork.find_by_sql("SELECT * FROM student_works WHERE homework_common_id IN (SELECT id FROM homework_commons WHERE course_id = '#{course.id}')").count
+  end
+
   # 返回教师数量，即roles表中定义的Manager
   def teacherCount project
     project ? project.members.count - studentCount(project).to_i : 0
@@ -116,7 +121,7 @@ module CoursesHelper
     @course.journals_for_messages.where('m_parent_id IS NULL').count
   end
 
-  #当前学期
+  #当前学期(2015春季学期)
   def current_time_and_term course
     str = ""
     term = cur_course_term
@@ -144,6 +149,22 @@ module CoursesHelper
     val
   end
 
+  #当前学期(2015春)
+  def current_time_and_term_short course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term[0]
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term[0]
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term[0]
+    else
+      str = Time.now.year.to_s + cur_course_term[0]
+    end
+    str
+  end
+
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
    # searchStudent(project).count
@@ -585,6 +606,24 @@ module CoursesHelper
     Course.tagged_with(tag_name).order('updated_at desc')
   end
 
+  #分班下拉框
+  def course_group_option course
+    type = []
+    option1 = []
+    option1 << "暂无"
+    option1 << 0
+    type << option1
+    unless course.course_groups.nil?
+      course.course_groups.each do |cg|
+        option = []
+        option << cg.name
+        option << cg.id
+        type << option
+      end
+    end
+    type
+  end
+
   #课程实践年份下拉框
   def course_time_option year
     type = []
@@ -746,7 +785,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if (attachment.is_public? && attachment.is_publish == 1) ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,course)|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end
@@ -826,7 +865,7 @@ module CoursesHelper
   # 学生按作业总分排序，取前8个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score is null,null,IF(student_works.final_score = 0, 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{course.id}
@@ -840,7 +879,9 @@ module CoursesHelper
   end
 
   def contributor_course_scor(course_id)
-    ccs = CourseContributorScore.where("course_id =?", course_id).order("total_score desc") .limit(9)
+    ccs = CourseContributorScore.find_by_sql("SELECT * FROM `course_contributor_scores` where course_id = #{course_id} order by
+        (message_num*2 + message_reply_num + news_reply_num + news_num +
+         resource_num*5 + journal_num + homework_journal_num ) desc limit 9;")
   end
 
 end

app/helpers/files_helper.rb

@@ -121,12 +121,13 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? ||
+      if (attachment.is_public? && attachment.container_type != "Course") ||
+          (attachment.is_public? && attachment.container_type == "Course" && attachment.is_publish == 1)||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||
           attachment.author_id == User.current.id ||
-          attachment.container_type == "OrgSubfield"
+          (attachment.container_type == "OrgSubfield" and User.current.member_of_org?(attachment.container.organization))
         result << attachment
       end
     end

app/helpers/routes_helper.rb

@@ -22,10 +22,18 @@ module RoutesHelper
   # Returns the path to project issues or to the cross-project
   # issue list if project is nil
   def _project_issues_path(project, *args)
-    if project
-      project_issues_path(project, *args)
+    if args[0].to_s.include? '_page'
+      if args[0].to_s == "user_page"
+        user_activities_path(args[1].to_i)
+      else
+        project_path(project)
+      end
     else
-      issues_path(*args)
+      if project
+        project_issues_path(project, *args)
+      else
+        issues_path(*args)
+      end
     end
   end