Merge remote-tracking branch 'remotes/origin/szzh' into develop

Guardfile

@@ -6,6 +6,7 @@
 # end
 #
 guard 'spork', :test_unit => true, :test_unit_env => {'RAILS_ENV' => 'test'}, :wait => 60 do
+  watch(%r{app/models/.+\.rb})
   watch('config/application.rb')
   watch('config/environment.rb')
   watch('config/environments/test.rb')

ReadMe.txt

@@ -1,19 +1,8 @@
-patch: 
+===================================[2014-04-09]=================================
-用户姓名的部分，根据issues#655。
+kw: 域名, 二级域名, subdomain, forge, course, contest
-为了修改方便
+域名跳转（forge/course/contest）这几个设置在settings.yml中
-alias：
+但是跳转在development模式下会导致无法开发
-方法     之前显示            调整之后
+
-name     firstname+lastname  login
-nickname xxx                 login
-realname xxx                 firstname+lastname
-
-User model经过修改，已经完全集成了user_extensions的功能
-例如
-user.gender=1
-user.save
-user_extensions字段会自动保存
-不必要每次user.user_extensions.xxx以及判断是否为空
-================================================================================
 app/models/setting.rb :165
   # fixed domain url in development. tantantan's bug
   if Rails.env.development?
@@ -23,51 +12,53 @@ app/models/setting.rb :165
   end
   程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。
   为了开发方便，使之功能在development模式下失效。 
-  # => nyan
+
-================================================================================
+
-app/controller/projects_controller.rb ===> projects#fake
+===================================[2014-04-09]=================================
-  fake filter: 修改了传到页面中的Count后缀的数量
+kw: 菜单, 导航栏, layout
-  改为正确的数量，删掉fake过滤器即可
+网页上方的导航条没有用Redmine::MenuManager
-================================================================================
+MenuManager的样式无法定制，菜单显示条件if中的proc执行行为没有了解
+
 #导航栏匹配域名显示和改变
 app\helper\application_helper.rb
-# rewrite navigation 
+render_dynamic_nav 方法中，利用变量，可以设置在layout中具体显示哪些条目
 
 app\views\layouts\_base_header.html.erb
-# reset navigation by domain name and url through regular match
+需要显示的条目，由具体的实例变量设置（在各个layout中）
-================================================================================
+
+
+===================================[2014-04-09]=================================
+kw: home_path, 首页, 跳转, 二级域名, welcome
 #首页根据域名匹配进入不同的页面
 app\controller\welcome_controller.rb
-  def entry_select_user
+#entry_select 放射设置二级域名所显示的首页
-    if request.original_url.match(/user\.trustie\.net/)
-      redirect_to(:controller => "users", :action => "index")
-      return 0
-    end
-  end
-================================================================================
 
-================================================================================
+
-0606：新坑
+
+===================================[2014-06-06]=================================
+kw: user_scores
 user_scores表结构有问题，需要运行
 bundle exec rake db:migrate:down VERSION=20140410021724
 bundle exec rake db:migrate:up VERSION=20140410021724
-===============================================================================
+
-0708：CKEditor插件加载方法
+
+
+===================================[2014-07-08]=================================
+kw: CKEditor, 富文本, 编辑器
+CKEditor插件加载方法
 1.把插件文件夹拷入plugins文件夹，确保文件夹名为redmine_ckeditor
 2.运行 bundle install --without development test
 3.运行 rake redmine:plugins:migrate RAILS_ENV=production
 4.启动服务器
-5.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor
+5.配置CKEditor插件(Administration > Plugins > Configure)
-6.配置CKEditor插件(Administration > Plugins > Configure)
+6.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor
-
+注意：一定要先配置CKEditor插件再见文本格式更改，不然，数据库不会生成对应记录，会报错。。
-某些情况数据库未插入插件配置值解决方案：
+
-1 复制plugins
+
-2 启动rails
+
-3 运行migrate
+===================================[2014-07-19]=================================
-3 打开admin配置插件（http://127.0.0.1:3000/settings/plugin/redmine_ckeditor）
+kw: 首页, 定制, forge, course, contest, 排序
-4 点击“查询”(就是确定的功能)
+若遇到首页定制报错问题请尝试如下操作
-===============================================================================
-0719：若遇到首页定制报错问题请尝试如下操作
 如果运行迁移文件有报错与‘sort_type’相关 先运行 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202
 在按如下步骤执行，未报与之相关的则直接按如下步骤执行
 1.运行 bundle exec rake db:migrate:down version=20140719080032

app/controllers/admin_controller.rb

@@ -24,6 +24,7 @@ class AdminController < ApplicationController
   before_filter :require_admin
   helper :sort
   helper :Users
+  helper :Settings
   include SortHelper
 
   def index
@@ -35,15 +36,12 @@ class AdminController < ApplicationController
 
     scope = Project.status(@status).order('lft')
     scope = scope.like(params[:name]) if params[:name].present?
-    @projects = scope.all
+    @projects = scope.where(project_type: Project::ProjectType_project).all
 
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def users
-    @project_type = params[:project_type]
-    role = params[:role]
-
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
 
@@ -55,95 +53,14 @@ class AdminController < ApplicationController
     end
 
     @status = params[:status] || 1
-    has = {
+    scope = User.logged.status(@status)
-        "show_changesets" => true
+    scope = User.like(params[:name]) if params[:name].present?
-    }
-    # @count = Redmine::Activity::Fetcher.new(User.current, :author => @user).scope_select {|t| !has["show_#{t}"].nil?}.events(nil, nil).count
-
-    scope = UserStatus.visible
-    case role
-      when 'teacher'
-        scope = UserStatus.teacher
-      when 'student'
-        scope = UserStatus.student
-      else
-
-    end
-
     scope = scope.in_group(params[:group_id]) if params[:group_id].present?
-    # scope.each do |user|
+
-    # UserStatus.create(:changesets_count => user.changesets.count, :watchers_count => user.watcher_users.count, :user_id => user.id)
-    # end
     @user_count = scope.count
     @user_pages = Paginator.new @user_count, @limit, params['page']
-    #@offset ||= @user_pages.offset
+    @offset ||= @user_pages.offset
-    #@users =  scope.order(sort_clause).limit(@limit).offset(@offset).all
+    @users = scope.order(sort_clause).limit(@limit).offset(@offset).all
-    @user_base_tag = params[:id] ? 'base_users':'base'
-    if params[:user_sort_type].present?
-      case params[:user_sort_type]
-        when '0'
-          @offset ||= @user_pages.reverse_offset
-          unless @offset == 0
-            @users_statuses = scope.offset(@offset).limit(@limit).all.reverse
-          else
-            limit = @user_count % @limit
-            if limit == 0
-              limit = @limit
-            end
-            @users_statuses = scope.offset(@offset).limit(limit).all.reverse
-          end
-          @s_type = 0
-        # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }
-        # @projects = @projects[@offset, @limit]
-        when '1'
-          @offset ||= @user_pages.reverse_offset
-          unless @offset == 0
-            @users_statuses = scope.reorder('grade').offset(@offset).limit(@limit).all.reverse
-          else
-            limit = @user_count % @limit
-            if limit == 0
-              limit = @limit
-            end
-            @users_statuses = scope.reorder('grade').offset(@offset).limit(limit).all.reverse
-          end
-          @s_type = 1
-        #sort {|x,y| y.user_status.changesets_count <=> x.user_status.changesets_count}
-        #@users = @users[@offset, @limit]
-        when '2'
-          @offset ||= @user_pages.reverse_offset
-          unless @offset == 0
-            @users_statuses = scope.reorder('watchers_count').offset(@offset).limit(@limit).all.reverse
-          else
-            limit = @user_count % @limit
-            if limit == 0
-              limit = @limit
-            end
-            @users_statuses = scope.reorder('watchers_count').offset(@offset).limit(limit).all.reverse
-          end
-          @s_type = 2
-        #@users = @users[@offset, @limit]
-      end
-
-    else
-      @offset ||= @user_pages.reverse_offset
-      unless @offset == 0
-        @users_statuses = scope.reorder('grade').offset(@offset).limit(@limit).all.reverse
-      else
-        limit = @user_count % @limit
-        if limit == 0
-          limit = @limit
-        end
-        @users_statuses = scope.reorder('grade').offset(@offset).limit(limit).all.reverse
-      end
-      @s_type = 1
-      # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }
-      # @projects = @projects[@offset, @limit]
-    end
-
-    @users = []
-    @users_statuses.each do |obj|
-      @users << User.find_by_id("#{obj.user_id}")
-    end
 
 
     respond_to do |format|
@@ -208,24 +125,13 @@ class AdminController < ApplicationController
     end
 
     @status = params[:status] || 1
-    has = {
-        "show_changesets" => true
-    }
     scope = User.logged.status(@status)
     scope = scope.like(params[:name]) if params[:name].present?
     @user_count = scope.count
     @user_pages = Paginator.new @user_count, @limit, params['page']
     @user_base_tag = params[:id] ? 'base_users':'base'
-    @offset ||= @user_pages.reverse_offset
+
-    unless @offset == 0
+    @users = scope.offset(@user_pages.offset).limit(@user_pages.per_page)
-      @users = scope.offset(@offset).limit(@limit).all.reverse
-    else
-      limit = @user_count % @limit
-      if limit == 0
-        limit = @limit
-      end
-      @users = scope.offset(@offset).limit(limit).all.reverse
-    end
 
     respond_to do |format|
       format.html {
@@ -242,8 +148,8 @@ class AdminController < ApplicationController
     elsif request.post?
       @first_page = FirstPage.where("page_type = 'project'").first
       @first_page.web_title = params[:web_title]
-      @first_page.description = params[:description]
+      @first_page.description = params[:first_page][:description]
-      @first_page.title = params[:title]
+      #@first_page.title = params[:title]
       @first_page.sort_type = params[:sort_type]
       if @first_page.save
         respond_to do |format|
@@ -305,14 +211,19 @@ class AdminController < ApplicationController
     if request.get?
       @contest_page = FirstPage.where("page_type = 'contest'").first
       @first_page = FirstPage.where("page_type = 'project'").first
+      @notification = ContestNotification.all.first;
     elsif request.post?
       @first_page = FirstPage.where("page_type = 'project'").first
       @contest_page = FirstPage.where("page_type = 'contest'").first
+      @notification = ContestNotification.all.first;
       @first_page.web_title = params[:web_title]
       @contest_page.web_title = params[:web_title]
       @contest_page.title = params[:contest_title]
       @contest_page.description = params[:contest_description]
-      if @first_page.save && @contest_page.save
+      @notification.title = params[:contest_notification_title]
+      @notification.content = params[:contest_notification][:content]
+
+      if @first_page.save && @contest_page.save && @notification.save
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_update)

app/controllers/application_controller.rb

@@ -482,14 +482,19 @@ class ApplicationController < ActionController::Base
   # Renders an error response
   def render_error(arg)
     arg = {:message => arg} unless arg.is_a?(Hash)
-
     @message = arg[:message]
+    @lay = arg[:layout]
     @message = l(@message) if @message.is_a?(Symbol)
     @status = arg[:status] || 500
 
     respond_to do |format|
       format.html {
+        if @lay
+          render :template => 'common/error', :layout => @lay,:status => @status
+        else
           render :template => 'common/error', :layout => use_layout, :status => @status
+        end
+
       }
       format.any { head @status }
     end

app/controllers/attachments_controller.rb

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AttachmentsController < ApplicationController
+  layout "users_base"
   before_filter :find_project, :only => [:show, :download, :thumbnail, :destroy, :delete_homework]#, :except => [:upload, :autocomplete]
   before_filter :file_readable, :read_authorize, :only => [:show, :thumbnail]#Modified by young
   before_filter :delete_authorize, :only => :destroy
@@ -172,7 +173,7 @@ class AttachmentsController < ApplicationController
 
     respond_to do |format|
       # modify by nwb
-      if @attachment.container_type == 'Course'
+      if @attachment.container.is_a?(Course) || @attachment.container.course
         if @course.nil?
           format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
         else
@@ -285,6 +286,8 @@ private
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
     if @attachment.container_type == 'Course'
       @course = @attachment.course
+    elsif @attachment.container.has_attribute?(:course) && @attachment.container.course
+      @course = @attachment.container.course
     else
       unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication'
         @project = @attachment.project

app/controllers/contest_notification_controller.rb

@@ -0,0 +1,5 @@
+class ContestNotificationController
+  def show
+
+  end
+end

app/controllers/documents_controller.rb

@@ -42,7 +42,8 @@ class DocumentsController < ApplicationController
     when 'title'
       @grouped = documents.group_by {|d| d.title.first.upcase}
     when 'author'
-      @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
+     # @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
+      @grouped = documents.group_by {|d| d.user.name }
     else
       @grouped = documents.group_by(&:category)
     end

app/controllers/files_controller.rb

@@ -163,7 +163,7 @@ class FilesController < ApplicationController
     end
    end
 
-  # 返回制定资源类型的资源列表
+  # 返回指定资源类型的资源列表
   # added by nwb
   def getattachtype
     sort_init 'created_on', 'desc' 

app/controllers/forums_controller.rb

@@ -1,5 +1,7 @@
 # added by fq
 class ForumsController < ApplicationController
+  layout "users_base"
+
   # GET /forums
   # GET /forums.json
   before_filter :find_forum_if_available
@@ -143,9 +145,10 @@ class ForumsController < ApplicationController
 
     respond_to do |format|
       if @forum.update_attributes(params[:forum])
-        format.html { redirect_to @forum, notice: 'Forum was successfully updated.' }
+        format.html { redirect_to @forum, notice: l(:label_forum_update_succ) }
         format.json { head :no_content }
       else
+        flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}"
         format.html { render action: "edit" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
       end

app/controllers/homework_attach_controller.rb

@@ -1,4 +1,5 @@
 class HomeworkAttachController < ApplicationController
+  layout "course_base"
   include CoursesHelper
   ###############################
   #判断当前角色权限时需先找到当前操作的project

app/controllers/issue_categories_controller.rb

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueCategoriesController < ApplicationController
+  layout "project_base"
   menu_item :settings
   model_object IssueCategory
   before_filter :find_model_object, :except => [:index, :new, :create]

app/controllers/news_controller.rb

@@ -98,9 +98,11 @@ class NewsController < ApplicationController
   end
 
   def new
+    #modify by nwb
+    if @project
       @news = News.new(:project => @project, :author => User.current)
-    @course_tag = @project.project_type
+    elsif @course
-    if @course_tag
+      @news = News.new(:course => @course, :author => User.current)
       render :layout => 'base_courses'
     end
   end

app/controllers/users_controller.rb

@@ -151,7 +151,7 @@ class UsersController < ApplicationController
 
   #  added by fq
   def user_activities
-    redirect_to user_path(@user, type: params[:type]) 
+    redirect_to user_path(@user, type: params[:type], page: params[:page]) 
     return
     # useless abort.
     @watcher = User.watched_by_id(@user)
@@ -315,7 +315,7 @@ class UsersController < ApplicationController
     # get users ActiveRecord
     @users = @users_statuses.includes(:user).map(&:user)
    
-    @user_base_tag = params[:id] ? 'base_users':'base'
+    @user_base_tag = params[:id] ? 'base_users':'users_base'
     respond_to do |format|
       format.html {
         @groups = Group.all.sort
@@ -344,7 +344,7 @@ class UsersController < ApplicationController
        scope = scope.like(params[:name]) if params[:name].present?
        @user_count = scope.count
        @user_pages = Paginator.new @user_count, @limit, params['page']
-       @user_base_tag = params[:id] ? 'base_users':'base'
+       @user_base_tag = params[:id] ? 'base_users':'users_base'
        @offset ||= @user_pages.reverse_offset
         unless @offset == 0
           @users = scope.offset(@offset).limit(@limit).all.reverse
@@ -475,7 +475,7 @@ class UsersController < ApplicationController
   def new
     @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
     @auth_sources = AuthSource.all
-    render :layout => "base"
+    render :layout => "users_base"
   end
 
   def create
@@ -510,7 +510,7 @@ class UsersController < ApplicationController
       @user.password = @user.password_confirmation = nil
 
       respond_to do |format|
-        format.html { render :action => 'new',:layout => "base" }
+        format.html { render :action => 'new',:layout => "users_base" }
         format.api  { render_validation_errors(@user) }
       end
     end
@@ -586,7 +586,7 @@ class UsersController < ApplicationController
   def destroy
     @user.destroy
     respond_to do |format|
-      format.html { redirect_back_or_default(users_path) }
+      format.html { redirect_back_or_default(admin_users_path) }
       format.api  { render_api_ok }
     end
   end

app/controllers/welcome_controller.rb

@@ -24,24 +24,19 @@ class WelcomeController < ApplicationController
  
   def index
     @first_page = FirstPage.where("page_type = 'project'").first
-    @hot_projects = find_miracle_project(10, 3)
-    @hot_projects_ids = []
-    @hot_projects.each do |p|
-      @hot_projects_ids << p
-    end
-    @projects_all = Project.active.visible.
-        joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").
-        where("#{Project.table_name}.project_type = ? and #{Project.table_name}.id in (?)", Project::ProjectType_project,@hot_projects_ids)
     if @first_page.nil? ||  @first_page.sort_type.nil?
-      @projects = @projects_all.order("grade desc")
+      @projects = find_miracle_project(10, 3,"grade desc")
     else
       case @first_page.sort_type
         when 0
-          @projects =  @projects_all.order("created_on desc")
+          @projects = find_miracle_project(10, 3,"created_on desc")
+          #@projects =  @projects_all.order("created_on desc")
         when 1
-          @projects = @projects_all.order("grade desc")
+          @projects = find_miracle_project(10, 3,"grade desc")
+          #@projects = @projects_all.order("grade desc")
         when 2
-          @projects = @projects_all.order("watchers_count desc")
+          @projects = find_miracle_project(10, 3,"watchers_count desc")
+          #@projects = @projects_all.order("watchers_count desc")
 
         #gcm
         #when '3'

app/controllers/words_controller.rb

@@ -216,7 +216,7 @@ class WordsController < ApplicationController
     elsif ( referer.match(/homework_attach/) || referer.match(/homework_attach/) )   #new added
       obj = HomeworkAttach.find_by_id(obj_id)
     else
-      raise 'create reply obj unknow type.'
+      raise "create reply obj unknow type.#{referer}"
     end
     obj
   end
@@ -240,7 +240,7 @@ class WordsController < ApplicationController
     elsif obj.kind_of? HomeworkAttach
       obj.add_jour(nil, nil, obj.id, options)   #new added
     else
-      raise 'create reply obj unknow type.'
+      raise "create reply obj unknow type.#{obj.class}"
     end
   end
   #######end of message

app/controllers/zipdown_controller.rb

@@ -1,4 +1,5 @@
 class ZipdownController < ApplicationController
+
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]
   #检查权限
@@ -41,16 +42,19 @@ class ZipdownController < ApplicationController
       if homework != nil
         if homework.attachments.count > 0
           zipfile = zip_homework_by_user homework
-          send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if zipfile
+          send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
         else
-          render_403 :message => :no_file_dowmload
+          render_403 :message => :no_file_dowmload ,:layout => "course_base"
         end
       else
-        render_403 :message =>:notice_file_not_found
+        render_403 :message =>:notice_file_not_found ,:layout => "course_base"
       end
     else
-      render_403 :message => :notice_not_authorized
+      render_403 :message => :notice_not_authorized ,:layout => "course_base"
     end
+
+  rescue => e
+    render file: 'public/file_not_found.html'
   end
 
   private

app/helpers/application_helper.rb

@@ -1703,7 +1703,7 @@ module ApplicationHelper
   def render_dynamic_nav
     home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'}
     home_link = "<li>" << home_link <<  "</li>"
-    bootstrap_render_dynamic_nav
+    # bootstrap_render_dynamic_nav
     content_tag :ul, (home_link.html_safe+bootstrap_render_dynamic_nav)
   end
 

app/helpers/user_score_helper.rb

@@ -337,7 +337,202 @@ module UserScoreHelper
                                       :activity => activity, :file => file, :issue => issue, :level => level)
   end
 
+  #====================================================================================================
+  def get_option_number(user,type,project_id=nil)
+    if project_id.nil?
+      option_number = OptionNumber.where("user_id = '#{user.id}' and score_type = '#{type}'");
+    else
+      option_number = OptionNumber.where("user_id = '#{user.id}' and score_type = '#{type}' and project_id = '#{project_id}'");
+    end
+
+     result = nil
+     if option_number.nil? || option_number.count == 0
+       result = OptionNumber.new
+       result.user_id = user.id
+       result.memo = 0
+       result.messages_for_issues = 0
+       result.issues_status = 0
+       result.replay_for_message = 0
+       result.replay_for_memo = 0
+       result.follow = 0
+       result.tread = 0
+       result.praise_by_one = 0
+       result.praise_by_two = 0
+       result.praise_by_three = 0
+       result.tread_by_one = 0
+       result.tread_by_two = 0
+       result.tread_by_three = 0
+       result.changeset = 0
+       result.document = 0
+       result.attachment = 0
+       result.issue_done_ratio = 0
+       result.post_issue = 0
+       result.total_score = 0
+       result.score_type  =type
+       unless project_id.nil?
+          result.project_id = project_id
+       end
+     else
+       result = option_number.first
+     end
+     result
+  end
+
+  #更新分数
+  def update_score(option_number)
+    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + active(option_number)
+    option_number.save
+  end
+
+  #协同得分
+  def collaboration(option_number)
+    option_number.memo * 2 + option_number.messages_for_issues + option_number.issues_status + option_number.replay_for_message + option_number.replay_for_memo
+  end
+  #影响力得分
+  def influence(option_number)
+    option_number.follow * 2
+  end
+  #技术得分
+  def skill(option_number)
+     option_number.praise_by_one * 4  + option_number.praise_by_two * 6 + option_number.praise_by_three * 8 - option_number.tread * 2 - option_number.tread_by_one * 2 - option_number.tread_by_two * 4 - option_number.tread_by_three * 6
+  end
+  #项目贡献得分
+  def active(option_number)
+    option_number.changeset * 4 + option_number.document * 4 + option_number.attachment * 4 + option_number.issue_done_ratio * 2 + option_number.post_issue * 4
+  end
+
+  #更新发帖数
+  def update_memo_number(user,type)
+    option_number = get_option_number(user,type)
+    option_number.memo = Message.includes(:author).where("parent_id IS NULL and author_id = '#{user.id}'").all.count +  Memo.includes(:author).where("parent_id IS NULL and author_id = '#{user.id}'").all.count
+    update_score(option_number)
+  end
+
+  #更新对缺陷留言数
+  def update_messges_for_issue(user,type)
+    option_number = get_option_number(user,type)
+    option_number.messages_for_issues = Journal.includes(:user).where("user_id = '#{user.id}'").all.count
+    update_score(option_number)
+  end
 
+  #更新更改缺陷状态状态次数
+  def update_issues_status(user,type)
+    option_number = get_option_number(user,type)
+    option_number.issues_status = Journal.joins(:details, :user).where("#{JournalDetail.table_name}.prop_key = 'status_id' and #{User.table_name}.id = '#{user.id}'").count
+    update_score(option_number)
+  end
+  #更新对留言的回复数量
+  def update_replay_for_message(user,type)
+    option_number = get_option_number(user,type)
+    option_number.replay_for_message = JournalsForMessage.includes(:user).where("m_parent_id IS NOT NULL and user_id = #{user.id}").count
+    update_score(option_number)
+  end
 
+  #更新对帖子的回复数量
+  def update_replay_for_memo(user,type)
+    option_number = get_option_number(user,type)
+    option_number.replay_for_memo = Message.includes(:author).where("parent_id IS NOT NULL and author_id = #{user.id}").all.count + Memo.includes(:author).where("parent_id IS NOT NULL and author_id = #{user.id}").all.count
+    update_score(option_number)
+  end
 
+  #更新被关注的人数
+  def update_follow(user,type)
+    option_number = get_option_number(user,type)
+    option_number.follow = Watcher.includes(:watchable).where("watchable_type = 'Principal' and watchable_id = '#{user.id}'").count
+    update_score(option_number)
+  end
+
+  #更新帖子踩各项数量
+  def update_tread(user,type)
+    option_number = get_option_number(user,type)
+    option_number.tread = PraiseTread.where("praise_tread_object_type = 'Memo' || praise_tread_object_type = 'Message' and praise_or_tread = 0 and user_id = '#{user.id}'").all.count
+    pts = PraiseTread.where("praise_tread_object_type = 'Memo' || praise_tread_object_type = 'Message' and praise_or_tread = 0").all
+    result = []
+    result1 = []
+    result2 = []
+    pts.each do |pt|
+      obj = PraiseTread.find_object_by_type_and_id(pt.praise_tread_object_type, pt.praise_tread_object_id)
+      if obj.nil?
+        next
+      end
+      target_user = obj.author
+      level = UserLevels.get_level(pt.user)#pt.user.get_level
+      project = pt.project
+      if level == 1 && target_user.id = user.id
+        result << pt
+      elsif level == 2 &&  target_user.id = user.id
+        result1 << pt
+      elsif level == 3 && target_user.id = user.id
+        result2 << pt
+      end
+    end
+    option_number.tread_by_one = result.count
+    option_number.tread_by_two = result1.count
+    option_number.tread_by_three = result2.count
+    update_score(option_number)
+  end
+
+  #更新帖子顶数量
+  def update_praise(user,type)
+    option_number = get_option_number(user,type)
+    pts = PraiseTread.where("praise_tread_object_type = 'Memo' || praise_tread_object_type = 'Message' and praise_or_tread = 1").all
+    result = []
+    result1 = []
+    result2 = []
+    pts.each do |pt|
+      obj = PraiseTread.find_object_by_type_and_id(pt.praise_tread_object_type, pt.praise_tread_object_id)
+      if obj.nil?
+        next
+      end
+      target_user = obj.author
+      level = UserLevels.get_level(pt.user)#pt.user.get_level
+      project = pt.project
+      if level == 1 && target_user.id = user.id
+        result << pt
+      elsif level == 2 &&  target_user.id = user.id
+        result1 << pt
+      elsif level == 3 && target_user.id = user.id
+        result2 << pt
+      end
+    end
+    option_number.praise_by_one = result.count
+    option_number.praise_by_two = result1.count
+    option_number.praise_by_three = result2.count
+    update_score(option_number)
+  end
+
+  #更新提交代码次数
+  def update_changeset(user,type)
+    option_number = get_option_number(user,type)
+    option_number.changeset = Changeset.includes(:user).where("user_id = '#{user.id}'").all.count
+    update_score(option_number)
+  end
+
+  #更新文档提交次数
+  def update_document(user,type)
+    option_number = get_option_number(user,type)
+    option_number.document =  Document.includes(:user).where("user_id = '#{user.id}'").all.count
+    update_score(option_number)
+  end
+
+  #更新附件提交数量
+  def update_attachment(user,type)
+    option_number = get_option_number(user,type)
+    option_number.attachment =  Attachment.includes(:author).where("author_id = '#{user.id}'").all.count
+    update_score(option_number)
+  end
+
+  #更新缺陷完成度次数
+  def update_issue_done_ratio(user,type)
+    option_number = get_option_number(user,type)
+    option_number.issue_done_ratio =  Journal.joins(:details, :user).where("#{JournalDetail.table_name}.prop_key = 'done_ratio' and #{User.table_name}.id = '#{user.id}'").count
+    update_score(option_number)
+  end
+
+  #更新发布缺陷次数
+  def update_post_issue(user,type)
+    option_number = get_option_number(user,type)
+    option_number.post_issue =  Issue.includes(:author).where("author_id = '#{user.id}'").all.count
+    update_score(option_number)
+  end
 end

app/helpers/welcome_helper.rb

@@ -203,12 +203,12 @@ module WelcomeHelper
     #end
   end
 
-  def find_miracle_project(sum, max_rate)
+  def find_miracle_project(sum, max_rate,order)
     #max = sum*(max_rate.to_f/10)
     #c1 = find_new_project(sum).to_a.dup
     #c2 = find_all_hot_project(sum).to_a.dup
     #(c2.take(sum-max)+c1.take(max)).take(sum)
-    find_all_hot_project(sum).dup#.to_a.dup
+    find_all_hot_project(sum,order).to_a.dup
   end
   
   def find_new_course limit=15
@@ -220,8 +220,8 @@ module WelcomeHelper
   end
 
 
-  def find_all_hot_project limit=15
+  def find_all_hot_project limit=15,order
-    sort_project_by_hot limit
+    sort_project_by_hot limit,order
   end
 
   def find_all_hot_course limit=15
@@ -366,8 +366,9 @@ module WelcomeHelper
 
   private
 
-  def sort_project_by_hot limit=15
+  def sort_project_by_hot limit=15,order
-    sort_project_by_hot_rails 0, 'grade DESC', limit
+    #'grade DESC'
+    sort_project_by_hot_rails 0,order , limit
   end
 
   def sort_course_by_hot limit=15
@@ -433,7 +434,7 @@ module WelcomeHelper
 			# FROM projects AS p LEFT OUTER JOIN (
 				# SELECT project_id,grade FROM project_statuses
 				# WHERE project_type = #{project_type} ORDER BY #{order_by} LIMIT #{limit} ) AS t ON p.id = t.project_id ")
-    Project.visible.joins(:project_status).where("#{Project.table_name}.project_type = ?", project_type).order(order_by).limit(limit)#.all
+    Project.visible.joins(:project_status).where("#{Project.table_name}.project_type = ?", project_type).order(order_by).limit(limit).all
   end
 
   def sort_bid_by_hot_rails reward_type, limit = 10

app/models/contest_notification.rb

@@ -0,0 +1,3 @@
+class ContestNotification < ActiveRecord::Base
+  attr_accessible :content, :title
+end

app/models/first_page.rb

@@ -2,5 +2,5 @@ class FirstPage < ActiveRecord::Base
   attr_accessible :description, :title, :web_title,:page_type,:sort_type
   validates_presence_of :web_title, :title, :description,:page_type
   validates_length_of :web_title,:title, maximum: 30
-  validates_length_of :description, maximum: 100
+  #validates_length_of :description, maximum: 100
 end

app/models/issue.rb

@@ -18,6 +18,7 @@
 class Issue < ActiveRecord::Base
   include Redmine::SafeAttributes
   include Redmine::Utils::DateCalculation
+  include UserScoreHelper
 
   belongs_to :project
   belongs_to :tracker
@@ -1507,17 +1508,20 @@ class Issue < ActiveRecord::Base
     #缺陷完成度更新
     if self.done_ratio_changed?
       UserScore.project(:update_issue_ratio, User.current,self,{ issue_id: self.id })
+      #update_issue_done_ratio(User.current,1)
     end
     #缺陷状态更改
     if self.status_id_changed?
     #协同得分
     UserScore.joint(:change_issue_status, User.current,nil,self, {issue_id: self.id})
+    #update_issues_status(self.author , 1)
     end
   end
 
   #发布缺陷
   def be_user_score_new_issue
     UserScore.project(:post_issue, User.current,self, { issue_id: self.id })
+    update_post_issue(self.author,1)
   end
 
 

app/models/journal.rb

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Journal < ActiveRecord::Base
+  include UserScoreHelper
   belongs_to :journalized, :polymorphic => true
   # added as a quick fix to allow eager loading of the polymorphic association
   # since always associated to an issue, for now
@@ -161,6 +162,7 @@ class Journal < ActiveRecord::Base
     if !self.notes.nil? && self.notes.gsub(' ','') != ''
       #协同得分加分
       UserScore.joint(:post_issue_message, User.current,self.issue.author,self, { message_id: self.id })
+      update_messges_for_issue(User.current,1)
     end
   end
   # 减少用户分数     -by zjc

app/models/journal_detail.rb

@@ -16,9 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class JournalDetail < ActiveRecord::Base
+  include UserScoreHelper
   belongs_to :journal
   before_save :normalize_values
-
+  after_create :be_user_score
   private
 
   def normalize_values
@@ -38,4 +39,15 @@ class JournalDetail < ActiveRecord::Base
       v
     end
   end
+
+  def be_user_score
+    #更新缺陷完成度
+    if self.prop_key = 'done_ratio'
+      update_issue_done_ratio(User.current,1)
+    #更新缺陷状态
+    elsif self.prop_key = 'status_id'
+      update_issues_status(User.current , 1)
+    end
+  end
+
 end

app/models/journals_for_message.rb

@@ -3,6 +3,7 @@
 # 注意reply_id 是提到人的id，不是留言id, Base中叫做 at_user
 class JournalsForMessage < ActiveRecord::Base
   include Redmine::SafeAttributes
+  include UserScoreHelper
   safe_attributes   "jour_type", # 留言所属类型
                       "jour_id", # 留言所属类型的id
                         "notes", # 留言内容
@@ -132,6 +133,7 @@ class JournalsForMessage < ActiveRecord::Base
     if self.reply_id != 0
       #协同得分加分
       UserScore.joint(:reply_message, User.current,User.find(self.reply_id),self, { journals_for_messages_id: self.id })
+      update_replay_for_message(User.current,1)
     end
   end
   # 更新用户分数     -by zjc

app/models/memo.rb

@@ -1,5 +1,6 @@
 class Memo < ActiveRecord::Base
 	include Redmine::SafeAttributes
+  include UserScoreHelper
 	belongs_to :forum
 	belongs_to :author, :class_name => "User", :foreign_key => 'author_id' 
 
@@ -148,9 +149,11 @@ class Memo < ActiveRecord::Base
     #新建memo且无parent的为发帖
     if self.parent_id.nil?
       UserScore.joint(:post_message, User.current,nil,self ,{ memo_id: self.id })
+      update_memo_number(User.current,1)
       #新建memo且有parent的为回帖
     elsif !self.parent_id.nil?
       UserScore.joint(:reply_posting, User.current,self.parent.author,self, { memo_id: self.id })
+      update_replay_for_memo(User.current,1)
     end
   end
 

app/models/message.rb

@@ -17,6 +17,8 @@
 
 class Message < ActiveRecord::Base
   include Redmine::SafeAttributes
+  include UserScoreHelper
+
   belongs_to :board
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
@@ -149,9 +151,11 @@ class Message < ActiveRecord::Base
     #新建message且无parent的为发帖
     if self.parent_id.nil?
       UserScore.joint(:post_message, User.current,nil,self, { message_id: self.id })
+      update_memo_number(User.current,1)
     #新建message且有parent的为回帖
     elsif !self.parent_id.nil?
       UserScore.joint(:reply_posting, User.current,self.parent.author,self, { message_id: self.id })
+      update_replay_for_memo(User.current,1)
     end
   end
   #减少用户分数

app/models/option_number.rb

@@ -0,0 +1,4 @@
+class OptionNumber < ActiveRecord::Base
+  attr_accessible :attachment, :changeset, :document, :follow, :issue_done_ratio, :issues_status, :memo, :messages_for_issues, :post_issue, :praise_by_one, :praise_by_three, :praise_by_two, :replay_for_memo, :replay_for_message, :score_type, :total_score, :tread, :tread_by_one, :tread_by_three, :tread_by_two, :user_id
+
+end

app/models/softapplication.rb

@@ -10,7 +10,6 @@ class Softapplication < ActiveRecord::Base
   belongs_to :user
   belongs_to :project
   has_many :contests, :through => :contesting_softapplications
-  belongs_to :project
 
   def add_jour(user, notes, reference_user_id = 0, options = {})
     if options.count == 0

app/views/admin/contest_page_made.html.erb

@@ -29,7 +29,26 @@
       <label for='contest_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
       <%= text_area_tag 'contest_description',@contest_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
     </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label>&nbsp;&nbsp;&nbsp;<%= link_to l(:label_notification), '#',
+                                           :onclick => '$("#notification").slideToggle(400); ' %></label>
+
+    </p>
+    <div style="margin-left:60px;padding-right: 20px;" id="notification">
 
+        <label for='contest_notification_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_contest_notification_title) %>:</label>
+      <p style="margin-left:70px;padding-right: 20px;">
+        <%= text_field_tag 'contest_notification_title', params[:label_contest_notification_title], :value => @notification.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+      <label for='contest_notification' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_contest_notification_content)%>:</label>
+      <%= text_area 'contest_notification', 'content', :value => @notification.content,:cols => 80, :rows => 15, :class => 'wiki-edit' %>
+      <%= wikitoolbar_for 'contest_notification_content' %>
+      <!-- <script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
+
+      <p><#%= text_area 'contest_notification', 'content', :value => @notification.content,:required => true, :size => 80,:class => 'wiki-edit', id: 'editor01' %></p>
+      <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>  -->
+
+    </div>
     <%= submit_tag l(:button_save), :class => "small", :name => nil %>
 <% end %>
 <div>

app/views/admin/first_page_made.html.erb

@@ -20,13 +20,15 @@
         <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
     </div>
 
-    <p style="margin-left:60px;padding-right: 20px;">
+    <!-- <p style="margin-left:60px;padding-right: 20px;">
-      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <label for='title'>&nbsp;&nbsp;&nbsp;<#%= l(:label_site_title) %>:</label>
-      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      <#%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
-      </p>
+      </p> -->
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
-      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      <!-- <#%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %> -->
+      <%= text_area 'first_page', 'description', :value => @first_page.description,:cols => 80, :rows => 15, :class => 'wiki-edit' %>
+      <%= wikitoolbar_for 'first_page_description' %>
     </p>
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='sort_type' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_sort_type)%>:</label>

app/views/admin/search.html.erb

@@ -5,7 +5,7 @@
 
     <h3><%= l(:label_user_plural)%></h3>
 
-    <%= form_tag(:controller => 'admin', :action => 'search', :method => :get) do %>
+    <%= form_tag(:controller => 'admin', :action => 'search') do %>
         <fieldset>
           <legend>
             <%= l(:label_filter_plural) %>
@@ -51,7 +51,7 @@
               <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
               <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
               <td class="buttons"> <%= change_status_link(user) %>
-                <%= delete_link user_path(user, :back_url => users_path(params)) unless User.current == user %> </td>
+                <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
         </tbody>

app/views/admin/users.html.erb

@@ -5,7 +5,7 @@
 
     <h3><%= l(:label_user_plural)%></h3>
 
-    <%= form_tag(:controller => 'admin', :action => 'search', :method => :get) do %>
+    <%= form_tag(:controller => 'admin', :action => 'search') do %>
         <fieldset>
           <legend>
             <%= l(:label_filter_plural) %>
@@ -51,7 +51,7 @@
               <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
               <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
               <td class="buttons"> <%= change_status_link(user) %>
-                <%= delete_link user_path(user, :back_url => users_path(params)) unless User.current == user %> </td>
+                <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
         </tbody>

app/views/attachments/_form.html.erb

@@ -35,3 +35,5 @@
 <% content_for :header_tags do %>
   <%= javascript_include_tag 'attachments' %>
 <% end %>
+
+

app/views/documents/show.html.erb

@@ -11,7 +11,7 @@
 
 <h2><%=h @document.title %></h2>
 
-<p><em><%=h @document.category.name %><br />
+<p><em><%#=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
 <div class="wiki">
 <%= textilizable @document, :description, :attachments => @document.attachments %>

app/views/homework_attach/edit.html.erb

@@ -1,7 +1,4 @@
-<% @nav_dispaly_course_all_label = 1
+
-   @nav_dispaly_forum_label = 1
-   @nav_dispaly_course_label = nil
-   @nav_dispaly_store_all_label = 1 %>
 <script type="text/javascript">
     function switchTab(ProTag) {
         var display_index = 3 - ProTag;

app/views/layouts/project_base.html.erb

@@ -0,0 +1,47 @@
+<% @nav_dispaly_project_label = 1
+   @nav_dispaly_forum_label = 1 %>
+<!DOCTYPE html>
+<html lang="<%= current_language %>">
+<head>
+  <meta charset="utf-8" />
+  <title><%=h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%= yield :header_tags -%>
+</head>
+<body class="<%=h body_css_classes %>">
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <%=render :partial => 'layouts/base_header'%>
+      <div id="main" class="nosidebar">
+        <div id="content_">
+          <%= render_flash_messages %>
+          <%= yield %>
+          <%= call_hook :view_layouts_base_content %>
+          <div style="clear:both;"></div>
+          <%=render :partial => 'layouts/base_footer'%>
+        </div>
+
+      </div>
+    </div>
+
+    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+    <div id="ajax-modal" style="display:none;"></div>
+
+
+  </div>
+</div>
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>

app/views/layouts/users_base.html.erb

@@ -0,0 +1,50 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
+<!DOCTYPE html>
+<html lang="<%= current_language %>">
+<head>
+  <meta charset="utf-8" />
+  <title><%=h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%= yield :header_tags -%>
+</head>
+<body class="<%=h body_css_classes %>">
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <%=render :partial => 'layouts/base_header'%>
+      <div id="main" class="nosidebar">
+        <div id="content_">
+          <%= render_flash_messages %>
+          <%= yield %>
+          <%= call_hook :view_layouts_base_content %>
+          <div style="clear:both;"></div>
+          <%=render :partial => 'layouts/base_footer'%>
+        </div>
+
+      </div>
+    </div>
+
+    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+    <div id="ajax-modal" style="display:none;"></div>
+
+
+  </div>
+</div>
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>

app/views/projects/_member_list.html.erb

@@ -24,7 +24,7 @@
 			<%= content_tag "div", content_tag("p", rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ')), :class => "clear avatar_name" %>
 					<div class="clear avatar_user">
 						<p>
-							<%= l(:label_user_for_project_grade) %>: <span style="color:#ec6300"><%= UserGrade.find_by_user_id_and_project_id(member[:user_id], @project.id).grade %></span>
+							<%= l(:label_user_for_project_grade) %>: <span style="color:#ec6300"><%= format("%.2f" ,UserGrade.find_by_user_id_and_project_id(member[:user_id], @project.id).grade).to_i %></span>
 						</p>
 					</div>
 		<% end %>

app/views/users/index.html.erb

@@ -1,8 +1,4 @@
-<% @nav_dispaly_home_path_label = 1
+
-                                    @nav_dispaly_main_course_label = 1
-                                    @nav_dispaly_main_project_label = 1
-                                    @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
 <!-- modified by huang -->
 <script type="text/javascript">
     function searchUser(){

app/views/users/new.html.erb

@@ -1,8 +1,4 @@
-<% @nav_dispaly_home_path_label = 1
+
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
 <h3><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h3>
 
 <%= labelled_form_for @user do |f| %>

app/views/welcome/index.html.erb

@@ -45,7 +45,8 @@
 		</div>		
 	<div class="welcome_left" id="welcome_left">
       <% unless @first_page.nil? %>
-		<span class="font_welcome_trustie"><%= @first_page.title %></span> <span class="font_welcome_tdescription">, <%= @first_page.description %></span>
+		<!-- <span class="font_welcome_trustie"><#%= @first_page.title %></span> <span class="font_welcome_tdescription">, <#%= @first_page.description %></span> -->
+          <%= @first_page.description.html_safe %>
       <% end %>
 	</div>
 	<div class="search-bar" id="search-bar">

config/configuration.yml

@@ -92,7 +92,7 @@ default:
       domain: smtp.gmail.com
       authentication: :plain
       user_name: trustieforge@gmail.com
-      password: '!@#$%^&*()'
+      password: '!@#$%^&*('
 
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.

config/locales/zh.yml

@@ -573,6 +573,8 @@ zh:
   label_site_description: 网站简介
   label_site_image: 简介图片
   label_sort_type: 热门项目排序方式
+  label_contest_notification_title: 竞赛通知标题
+  label_contest_notification_content: 竞赛通知内容
   #by young
   label_requirement: 需求
   label_new_course: 课程列表
@@ -1916,6 +1918,8 @@ zh:
   label_memo_create_fail: 发布失败
   label_forum_create_succ: 贴吧新建成功
   label_forum_create_fail: 贴吧新建失败
+  label_forum_update_succ: 贴吧更新成功
+  label_forum_update_fail: 贴吧更新失败
   label_first_page_create_fail: 首页定制失败
   label_forum_edit: 编辑讨论区
   label_memo_create: 发布

config/routes.rb

@@ -42,6 +42,8 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  resources :contest_notification
+
   resources :open_source_projects do
     collection do
       match 'search', via: [:get, :post]

db/migrate/20140722080529_create_contest_notifications.rb

@@ -0,0 +1,10 @@
+class CreateContestNotifications < ActiveRecord::Migration
+  def change
+    create_table :contest_notifications do |t|
+      t.text :title
+      t.text :content
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20140722080924_set_notification.rb

@@ -0,0 +1,19 @@
+# -*coding:utf-8 -*-
+class SetNotification < ActiveRecord::Migration
+  def change
+    notifications = ContestNotification.all
+    if notifications.nil? || notifications.count == 0
+      notification = ContestNotification.new
+      notification.title = "2014年Android程序设计大赛获奖名单"
+      notification.content = "<div><span style='color: red'>一等奖:</span>&nbsp;<span style='color: #1166AD'>消灭那怪兽</span></div>
+          <div><span style='color: red'>二等奖:</span>&nbsp;<span style='color: #1166AD'>兄弟向前冲 </span></div>
+      <div><span style='color: red'>二等奖:</span>&nbsp;<span style='color: #1166AD'>鸟鸟文件管理器（银河之光版）</span></div>
+      <div><span style='color: red'>三等奖:</span>&nbsp;<span style='color: #1166AD'>疯狂猜图</span></div>
+      <div><span style='color: red'>三等奖:</span>&nbsp;<span style='color: #1166AD'>愉快的定向越野 </span></div>
+      <div><span style='color: red'>三等奖:</span>&nbsp;<span style='color: #1166AD'>体能训练助手 </span></div>
+      <div><span style='color: red'>三等奖:</span>&nbsp;<span style='color: #1166AD'>迷你日记本 </span></div>
+      <div><span style='color: red'>三等奖:</span>&nbsp;<span style='color: #1166AD'>永齐飞机大战</span></div>"
+       notification.save
+    end
+  end
+end

db/migrate/20140723082637_create_option_numbers.rb

@@ -0,0 +1,29 @@
+class CreateOptionNumbers < ActiveRecord::Migration
+  def change
+    create_table :option_numbers do |t|
+      t.string :user_id
+      t.integer :memo
+      t.integer :messages_for_issues
+      t.integer :issues_status
+      t.integer :replay_for_message
+      t.integer :replay_for_memo
+      t.integer :follow
+      t.integer :tread
+      t.integer :praise_by_one
+      t.integer :praise_by_two
+      t.integer :praise_by_three
+      t.integer :tread_by_one
+      t.integer :tread_by_two
+      t.integer :tread_by_three
+      t.integer :changeset
+      t.integer :document
+      t.integer :attachment
+      t.integer :issue_done_ratio
+      t.integer :post_issue
+      t.integer :score_type
+      t.integer :total_score
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20140724080319_change_option_number.rb

@@ -0,0 +1,6 @@
+class ChangeOptionNumber < ActiveRecord::Migration
+  def change
+    change_column("option_numbers","user_id",:integer)
+    add_column("option_numbers","project_id",:integer)
+  end
+end

db/migrate/20140725013735_alter_first_page.rb

@@ -0,0 +1,5 @@
+class AlterFirstPage < ActiveRecord::Migration
+  def change
+    change_column("first_pages","description",:text)
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140721074353) do
+ActiveRecord::Schema.define(:version => 20140725013735) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -241,6 +241,13 @@ ActiveRecord::Schema.define(:version => 20140721074353) do
   add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
   add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
 
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "contesting_projects", :force => true do |t|
     t.integer  "project_id"
     t.string   "contest_id"
@@ -411,7 +418,7 @@ ActiveRecord::Schema.define(:version => 20140721074353) do
   create_table "first_pages", :force => true do |t|
     t.string   "web_title"
     t.string   "title"
-    t.string   "description"
+    t.text     "description"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
     t.string   "page_type"
@@ -709,6 +716,33 @@ ActiveRecord::Schema.define(:version => 20140721074353) do
     t.datetime "updated_at",                      :null => false
   end
 
+  create_table "option_numbers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "memo"
+    t.integer  "messages_for_issues"
+    t.integer  "issues_status"
+    t.integer  "replay_for_message"
+    t.integer  "replay_for_memo"
+    t.integer  "follow"
+    t.integer  "tread"
+    t.integer  "praise_by_one"
+    t.integer  "praise_by_two"
+    t.integer  "praise_by_three"
+    t.integer  "tread_by_one"
+    t.integer  "tread_by_two"
+    t.integer  "tread_by_three"
+    t.integer  "changeset"
+    t.integer  "document"
+    t.integer  "attachment"
+    t.integer  "issue_done_ratio"
+    t.integer  "post_issue"
+    t.integer  "score_type"
+    t.integer  "total_score"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "project_id"
+  end
+
   create_table "praise_tread_caches", :force => true do |t|
     t.integer  "object_id",   :null => false
     t.string   "object_type"
@@ -844,6 +878,19 @@ ActiveRecord::Schema.define(:version => 20140721074353) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb

@@ -83,6 +83,14 @@ module Redmine
         end
 
         def save_attachments(attachments, author=User.current)
+          # 清除临时文件
+          if attachments
+            tempAttach = attachments[:dummy]
+            if  tempAttach && tempAttach[:file]
+              attachments.delete(:dummy)
+            end
+          end
+
           if attachments.is_a?(Hash)
             attachments = attachments.stringify_keys
             attachments = attachments.to_a.sort {|a, b|

public/javascripts/attachments.js

@@ -156,12 +156,12 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
 }
 
 function addInputFiles(inputEl) {
-  var clearedFileInput = $(inputEl).clone().val('');
+   // var clearedFileInput = $(inputEl).clone().val('');
 
     if (inputEl.files) {
         // upload files using ajax
         uploadAndAttachFiles(inputEl.files, inputEl);
-    $(inputEl).remove();
+     //   $(inputEl).remove();
     } else {
         // browser not supporting the file API, upload on form submission
         var attachmentId;
@@ -172,7 +172,7 @@ function addInputFiles(inputEl) {
         }
     }
 
-  clearedFileInput.insertAfter('#attachments_fields');
+    //clearedFileInput.insertAfter('#attachments_fields');
 }
 
 function uploadAndAttachFiles(files, inputEl) {

test/fixtures/contest_notifications.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  title: MyString
+  content: MyString
+
+two:
+  title: MyString
+  content: MyString

test/fixtures/option_numbers.yml

@@ -0,0 +1,47 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  user_id: MyString
+  memo: 1
+  messages_for_issues: 1
+  issues_status: 1
+  replay_for_message: 1
+  replay_for_memo: 1
+  follow: 1
+  tread: 1
+  praise_by_one: 1
+  praise_by_two: 1
+  praise_by_three: 1
+  tread_by_one: 1
+  tread_by_two: 1
+  tread_by_three: 1
+  changeset: 1
+  document: 1
+  attachment: 1
+  issue_done_ratio: 1
+  post_issue: 1
+  score_type: 1
+  total_score: 1
+
+two:
+  user_id: MyString
+  memo: 1
+  messages_for_issues: 1
+  issues_status: 1
+  replay_for_message: 1
+  replay_for_memo: 1
+  follow: 1
+  tread: 1
+  praise_by_one: 1
+  praise_by_two: 1
+  praise_by_three: 1
+  tread_by_one: 1
+  tread_by_two: 1
+  tread_by_three: 1
+  changeset: 1
+  document: 1
+  attachment: 1
+  issue_done_ratio: 1
+  post_issue: 1
+  score_type: 1
+  total_score: 1

test/functional/issue_categories_controller_test.rb

@@ -0,0 +1,145 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class IssueCategoriesControllerTest < ActionController::TestCase
+  fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories,
+           :issues
+
+  def setup
+    User.current = nil
+    @request.session[:user_id] = 2
+  end
+
+  def test_new
+    @request.session[:user_id] = 2 # manager
+    get :new, :project_id => '1'
+    assert_response :success
+    assert_template 'new'
+    assert_select 'input[name=?]', 'issue_category[name]'
+  end
+
+  def test_new_from_issue_form
+    @request.session[:user_id] = 2 # manager
+    xhr :get, :new, :project_id => '1'
+
+    assert_response :success
+    assert_template 'new'
+    assert_equal 'text/javascript', response.content_type
+  end
+
+  def test_create
+    @request.session[:user_id] = 2 # manager
+    assert_difference 'IssueCategory.count' do
+      post :create, :project_id => '1', :issue_category => {:name => 'New category'}
+    end
+    assert_redirected_to '/projects/ecookbook/settings/categories'
+    category = IssueCategory.find_by_name('New category')
+    assert_not_nil category
+    assert_equal 1, category.project_id
+  end
+
+  def test_create_failure
+    @request.session[:user_id] = 2
+    post :create, :project_id => '1', :issue_category => {:name => ''}
+    assert_response :success
+    assert_template 'new'
+  end
+
+  def test_create_from_issue_form
+    @request.session[:user_id] = 2 # manager
+    assert_difference 'IssueCategory.count' do
+      xhr :post, :create, :project_id => '1', :issue_category => {:name => 'New category'}
+    end
+    category = IssueCategory.first(:order => 'id DESC')
+    assert_equal 'New category', category.name
+
+    assert_response :success
+    assert_template 'create'
+    assert_equal 'text/javascript', response.content_type
+  end
+
+  def test_create_from_issue_form_with_failure
+    @request.session[:user_id] = 2 # manager
+    assert_no_difference 'IssueCategory.count' do
+      xhr :post, :create, :project_id => '1', :issue_category => {:name => ''}
+    end
+
+    assert_response :success
+    assert_template 'new'
+    assert_equal 'text/javascript', response.content_type
+  end
+
+  def test_edit
+    @request.session[:user_id] = 2
+    get :edit, :id => 2
+    assert_response :success
+    assert_template 'edit'
+    assert_select 'input[name=?][value=?]', 'issue_category[name]', 'Recipes'
+  end
+
+  def test_update
+    assert_no_difference 'IssueCategory.count' do
+      put :update, :id => 2, :issue_category => { :name => 'Testing' }
+    end
+    assert_redirected_to '/projects/ecookbook/settings/categories'
+    assert_equal 'Testing', IssueCategory.find(2).name
+  end
+
+  def test_update_failure
+    put :update, :id => 2, :issue_category => { :name => '' }
+    assert_response :success
+    assert_template 'edit'
+  end
+
+  def test_update_not_found
+    put :update, :id => 97, :issue_category => { :name => 'Testing' }
+    assert_response 404
+  end
+
+  def test_destroy_category_not_in_use
+    delete :destroy, :id => 2
+    assert_redirected_to '/projects/ecookbook/settings/categories'
+    assert_nil IssueCategory.find_by_id(2)
+  end
+
+  def test_destroy_category_in_use
+    delete :destroy, :id => 1
+    assert_response :success
+    assert_template 'destroy'
+    assert_not_nil IssueCategory.find_by_id(1)
+  end
+
+  def test_destroy_category_in_use_with_reassignment
+    issue = Issue.where(:category_id => 1).first
+    delete :destroy, :id => 1, :todo => 'reassign', :reassign_to_id => 2
+    assert_redirected_to '/projects/ecookbook/settings/categories'
+    assert_nil IssueCategory.find_by_id(1)
+    # check that the issue was reassign
+    assert_equal 2, issue.reload.category_id
+  end
+
+  def test_destroy_category_in_use_without_reassignment
+    issue = Issue.where(:category_id => 1).first
+    delete :destroy, :id => 1, :todo => 'nullify'
+    assert_redirected_to '/projects/ecookbook/settings/categories'
+    assert_nil IssueCategory.find_by_id(1)
+    # check that the issue category was nullified
+    assert_nil issue.reload.category_id
+  end
+end

test/functional/issue_relations_controller_test.rb

@@ -0,0 +1,147 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class IssueRelationsControllerTest < ActionController::TestCase
+  fixtures :projects,
+           :users,
+           :roles,
+           :members,
+           :member_roles,
+           :issues,
+           :issue_statuses,
+           :issue_relations,
+           :enabled_modules,
+           :enumerations,
+           :trackers,
+           :projects_trackers
+
+  def setup
+    User.current = nil
+    @request.session[:user_id] = 3
+  end
+
+  def test_create
+    assert_difference 'IssueRelation.count' do
+      post :create, :issue_id => 1,
+                 :relation => {:issue_to_id => '2', :relation_type => 'relates', :delay => ''}
+    end
+    relation = IssueRelation.first(:order => 'id DESC')
+    assert_equal 1, relation.issue_from_id
+    assert_equal 2, relation.issue_to_id
+    assert_equal 'relates', relation.relation_type
+  end
+
+  def test_create_xhr
+    assert_difference 'IssueRelation.count' do
+      xhr :post, :create, :issue_id => 3, :relation => {:issue_to_id => '1', :relation_type => 'relates', :delay => ''}
+      assert_response :success
+      assert_template 'create'
+      assert_equal 'text/javascript', response.content_type
+    end
+    relation = IssueRelation.first(:order => 'id DESC')
+    assert_equal 3, relation.issue_from_id
+    assert_equal 1, relation.issue_to_id
+
+    assert_match /Bug #1/, response.body
+  end
+
+  def test_create_should_accept_id_with_hash
+    assert_difference 'IssueRelation.count' do
+      post :create, :issue_id => 1,
+                 :relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
+    end
+    relation = IssueRelation.first(:order => 'id DESC')
+    assert_equal 2, relation.issue_to_id
+  end
+
+  def test_create_should_strip_id
+    assert_difference 'IssueRelation.count' do
+      post :create, :issue_id => 1,
+                 :relation => {:issue_to_id => ' 2  ', :relation_type => 'relates', :delay => ''}
+    end
+    relation = IssueRelation.first(:order => 'id DESC')
+    assert_equal 2, relation.issue_to_id
+  end
+
+  def test_create_should_not_break_with_non_numerical_id
+    assert_no_difference 'IssueRelation.count' do
+      assert_nothing_raised do
+        post :create, :issue_id => 1,
+                   :relation => {:issue_to_id => 'foo', :relation_type => 'relates', :delay => ''}
+      end
+    end
+  end
+
+  def test_create_follows_relation_should_update_relations_list
+    issue1 = Issue.generate!(:subject => 'Followed issue', :start_date => Date.yesterday, :due_date => Date.today)
+    issue2 = Issue.generate!
+
+    assert_difference 'IssueRelation.count' do
+      xhr :post, :create, :issue_id => issue2.id,
+                 :relation => {:issue_to_id => issue1.id, :relation_type => 'follows', :delay => ''}
+    end
+    assert_match /Followed issue/, response.body
+  end
+
+  def test_should_create_relations_with_visible_issues_only
+    Setting.cross_project_issue_relations = '1'
+    assert_nil Issue.visible(User.find(3)).find_by_id(4)
+
+    assert_no_difference 'IssueRelation.count' do
+      post :create, :issue_id => 1,
+                 :relation => {:issue_to_id => '4', :relation_type => 'relates', :delay => ''}
+    end
+  end
+
+  should "prevent relation creation when there's a circular dependency"
+
+  def test_create_xhr_with_failure
+    assert_no_difference 'IssueRelation.count' do
+      xhr :post, :create, :issue_id => 3, :relation => {:issue_to_id => '999', :relation_type => 'relates', :delay => ''}
+
+      assert_response :success
+      assert_template 'create'
+      assert_equal 'text/javascript', response.content_type
+    end
+
+    assert_match /errorExplanation/, response.body
+  end
+
+  def test_destroy
+    assert_difference 'IssueRelation.count', -1 do
+      delete :destroy, :id => '2'
+    end
+  end
+
+  def test_destroy_xhr
+    IssueRelation.create!(:relation_type => IssueRelation::TYPE_RELATES) do |r|
+      r.issue_from_id = 3
+      r.issue_to_id = 1
+    end
+
+    assert_difference 'IssueRelation.count', -1 do
+      xhr :delete, :destroy, :id => '2'
+
+      assert_response :success
+      assert_template 'destroy'
+      assert_equal 'text/javascript', response.content_type
+      assert_match /relation-2/, response.body
+    end
+  end
+end

test/functional/issue_statuses_controller_test.rb

@@ -0,0 +1,123 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class IssueStatusesControllerTest < ActionController::TestCase
+  fixtures :issue_statuses, :issues, :users
+
+  def setup
+    User.current = nil
+    @request.session[:user_id] = 1 # admin
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'index'
+  end
+  
+  def test_index_by_anonymous_should_redirect_to_login_form
+    @request.session[:user_id] = nil
+    get :index
+    assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fissue_statuses'
+  end
+  
+  def test_index_by_user_should_respond_with_406
+    @request.session[:user_id] = 2
+    get :index
+    assert_response 406
+  end
+
+  def test_new
+    get :new
+    assert_response :success
+    assert_template 'new'
+  end
+
+  def test_create
+    assert_difference 'IssueStatus.count' do
+      post :create, :issue_status => {:name => 'New status'}
+    end
+    assert_redirected_to :action => 'index'
+    status = IssueStatus.order('id DESC').first
+    assert_equal 'New status', status.name
+  end
+
+  def test_create_with_failure
+    post :create, :issue_status => {:name => ''}
+    assert_response :success
+    assert_template 'new'
+    assert_error_tag :content => /name can&#x27;t be blank/i
+  end
+
+  def test_edit
+    get :edit, :id => '3'
+    assert_response :success
+    assert_template 'edit'
+  end
+
+  def test_update
+    put :update, :id => '3', :issue_status => {:name => 'Renamed status'}
+    assert_redirected_to :action => 'index'
+    status = IssueStatus.find(3)
+    assert_equal 'Renamed status', status.name
+  end
+
+  def test_update_with_failure
+    put :update, :id => '3', :issue_status => {:name => ''}
+    assert_response :success
+    assert_template 'edit'
+    assert_error_tag :content => /name can&#x27;t be blank/i
+  end
+
+  def test_destroy
+    Issue.delete_all("status_id = 1")
+
+    assert_difference 'IssueStatus.count', -1 do
+      delete :destroy, :id => '1'
+    end
+    assert_redirected_to :action => 'index'
+    assert_nil IssueStatus.find_by_id(1)
+  end
+
+  def test_destroy_should_block_if_status_in_use
+    assert_not_nil Issue.find_by_status_id(1)
+
+    assert_no_difference 'IssueStatus.count' do
+      delete :destroy, :id => '1'
+    end
+    assert_redirected_to :action => 'index'
+    assert_not_nil IssueStatus.find_by_id(1)
+  end
+
+  def test_update_issue_done_ratio_with_issue_done_ratio_set_to_issue_field
+    with_settings :issue_done_ratio => 'issue_field' do
+      post :update_issue_done_ratio
+      assert_match /not updated/, flash[:error].to_s
+      assert_redirected_to '/issue_statuses'
+    end
+  end
+
+  def test_update_issue_done_ratio_with_issue_done_ratio_set_to_issue_status
+    with_settings :issue_done_ratio => 'issue_status' do
+      post :update_issue_done_ratio
+      assert_match /Issue done ratios updated/, flash[:notice].to_s
+      assert_redirected_to '/issue_statuses'
+    end
+  end
+end

test/unit/contest_notification_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ContestNotificationTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/course_test.rb

@@ -15,7 +15,6 @@ class CourseTest < ActiveSupport::TestCase
     error_keys = course.errors.keys
 
     valid_attr = [:password, :term, :name, :class_period]
-    puts error_keys
     valid_attr.each do |attr|
       assert(error_keys.include?(attr), "attr unknow: #{attr}")
     end
@@ -43,7 +42,7 @@ class CourseTest < ActiveSupport::TestCase
     course.name = "test_course"
     assert course.valid?
     course.name = name_quirk
-    assert course.valid?
+    assert course.valid?, "Quirk name ===> #{course.name}"
   end
 
   test 'description too long must be valid.(4096)' do

test/unit/option_number_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class OptionNumberTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end