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

Conflicts:
	app/controllers/zipdown_controller.rb

app/controllers/admin_controller.rb

@@ -148,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|

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

@@ -286,7 +286,7 @@ private
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
     if @attachment.container_type == 'Course'
       @course = @attachment.course
-    elsif @attachment.container.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'

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/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]
   #检查权限
@@ -43,16 +44,17 @@ class ZipdownController < ApplicationController
           zipfile = zip_homework_by_user homework
           send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
         else
-          render file: 'zipdown/no_file_dowmload.js.erb'
+          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: 'zipdown/file_not_fond.js.erb'
+    render file: 'public/file_not_found.html'
   end
 
   private

app/helpers/user_score_helper.rb

@@ -338,14 +338,44 @@ module UserScoreHelper
   end
 
   #====================================================================================================
-  def get_option_number(user,type)
+  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}'");
-     if option_number.nil?
+    else
-      option_number = OptionNumber.new
+      option_number = OptionNumber.where("user_id = '#{user.id}' and score_type = '#{type}' and project_id = '#{project_id}'");
-        option_number.user_id = user.id
-        option_number.score_type  =type
     end
-      option_number
+
+     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
 
   #更新分数
@@ -374,7 +404,7 @@ module UserScoreHelper
   #更新发帖数
   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
+    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
 
@@ -401,7 +431,7 @@ module UserScoreHelper
   #更新对帖子的回复数量
   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}").count
+    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
 
@@ -412,5 +442,97 @@ module UserScoreHelper
     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/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/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/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

@@ -1919,6 +1919,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: 发布

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 => 20140723082637) do
+ActiveRecord::Schema.define(:version => 20140725013735) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -418,7 +418,7 @@ ActiveRecord::Schema.define(:version => 20140723082637) 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"
@@ -717,7 +717,7 @@ ActiveRecord::Schema.define(:version => 20140723082637) do
   end
 
   create_table "option_numbers", :force => true do |t|
-    t.string   "user_id"
+    t.integer  "user_id"
     t.integer  "memo"
     t.integer  "messages_for_issues"
     t.integer  "issues_status"
@@ -740,6 +740,7 @@ ActiveRecord::Schema.define(:version => 20140723082637) do
     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|

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/option_number_test.rb

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