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

ReadMe.txt

@@ -81,3 +81,10 @@ kw:
 默认支持如下格式："bmp,jpeg,jpg,png,gif"
 可在configuration.yml中修改，格式：pic_types: "bmp,jpeg,jpg,png,gif"(注意：pic_types若前面有#号需去掉)
 配置完成后重启服务
+
+=================================[2014-08-16]====================================
+kw:数据迁移，project_scores表已存在
+bundle exec rake db:migrate:down VERSION=20140811022947
+bundle exec rake db:migrate:up VERSION=20140811022947
+bundle exec rake db:migrate
+bundle exec rake project_score:calculate

app/helpers/user_score_helper.rb

@@ -384,6 +384,9 @@ module UserScoreHelper
   #更新分数
   def update_score(option_number)
     option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + active(option_number)
+    if option_number.total_score < 0
+      option_number.total_score = 0
+    end
     option_number.save
     option_number.total_score
   end

app/views/layouts/base_projects.html.erb

@@ -54,7 +54,7 @@
 						<div id="sidebar">
 							<div class="spaceleft">
 								<div class="inf_user_image">
-									<% #@project = Project.find_by_id(@project.id)%>
+									<% @project = Project.find_by_id(@project.id)%>
 									<table>
 										<tr>
 											<td><%= image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>

db/schema.rb

@@ -177,6 +177,58 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false
@@ -820,18 +872,18 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
+    t.string   "subject",                                                   :null => false
-    t.text     "content",                               :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
+    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",             :default => false
+    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",           :default => false
+    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                            :null => false
+    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                            :null => false
+    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -855,6 +907,19 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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
@@ -905,10 +970,11 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at",  :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1014,8 +1080,8 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1073,9 +1139,6 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
-    t.integer  "level"
-    t.integer  "file"
-    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|