From f3e4812d005ad4fedf995ebe2b5eca3dcb16984b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sun, 6 Sep 2015 15:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BE=97=E5=88=86=E6=96=B9=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/user_score_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/user_score_helper.rb b/app/helpers/user_score_helper.rb
index 5d76fce9b..c82255d00 100644
--- a/app/helpers/user_score_helper.rb
+++ b/app/helpers/user_score_helper.rb
@@ -423,7 +423,7 @@ module UserScoreHelper
 
   #更新分数
   def update_score(option_number)
-    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + active(option_number)
+    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + project_active(option_number)
     if option_number.total_score < 0
       option_number.total_score = 0
     end
@@ -444,7 +444,7 @@ module UserScoreHelper
      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)
+  def project_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