From 2799322a63be567c35f7917ddd64ba74e12fc2cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Thu, 9 Nov 2017 10:01:50 +0800
Subject: [PATCH] * Fix bug

---
 db/update9.6.sql       |  1 +
 module/score/model.php | 16 +++++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 db/update9.6.sql

diff --git a/db/update9.6.sql b/db/update9.6.sql
new file mode 100644
index 0000000000..5b43264d5b
--- /dev/null
+++ b/db/update9.6.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_score` DROP `objectID`;
diff --git a/module/score/model.php b/module/score/model.php
index dd85dd50b6..02fdb7f696 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -43,7 +43,6 @@ class scoreModel extends model
         $desc     = $this->lang->score->models[$module];
         $user     = empty($account) ? $this->app->user->account : $account;
         $time     = empty($time) ? helper::now() : $time;
-        $objectID = is_numeric($param) ? $param : 0;
 
         switch($module)
         {
@@ -72,7 +71,7 @@ class scoreModel extends model
                     {
                         $newRule          = $rule;
                         $newRule['score'] = $this->config->score->extended->storyClose['createID'];
-                        $this->saveScore($openedBy, $newRule, $module, $method, $desc, $objectID, $time);
+                        $this->saveScore($openedBy, $newRule, $module, $method, $desc, $time);
                         unset($newRule);
                     }
                 }
@@ -107,7 +106,6 @@ class scoreModel extends model
 
                 if($method == 'confirmBug')
                 {
-                    $objectID = $param->id;
                     $user     = $param->openedBy;
                     $desc    .= 'ID:' . $param->id;
                     if(!empty($this->config->score->extended->bugConfirmBug['severity'][$param->severity])) $rule['score'] = $rule['score'] + $this->config->score->extended->bugConfirmBug['severity'][$param->severity];
@@ -115,7 +113,6 @@ class scoreModel extends model
 
                 if($method == 'resolve' && !empty($this->config->score->extended->bugResolve['severity'][$param->severity]))
                 {
-                    $objectID      = $param->id;
                     $rule['score'] = $rule['score'] + $this->config->score->extended->bugResolve['severity'][$param->severity];
                 }
                 break;
@@ -130,7 +127,6 @@ class scoreModel extends model
                 if($method == 'close')
                 {
                     $desc      = $this->lang->score->methods[$module][$method] . ',' . $desc . 'ID:' . $param->id;
-                    $objectID  = $param->id;
                     $timestamp = empty($time) ? time() : strtotime($time);
 
                     /* Project PM. */
@@ -138,7 +134,7 @@ class scoreModel extends model
                     {
                         $rule['score'] = $this->config->score->extended->projectClose['manager']['close'];
                         if($param->end > date('Y-m-d', $timestamp)) $rule['score'] += $this->config->score->extended->projectClose['manager']['in'];
-                        $this->saveScore($param->PM, $rule, $module, $method, $desc, $objectID, $time);
+                        $this->saveScore($param->PM, $rule, $module, $method, $desc, $time);
                     }
 
                     /* Project team user. */
@@ -149,7 +145,7 @@ class scoreModel extends model
                         if($param->end > date('Y-m-d', $timestamp)) $rule['score'] += $this->config->score->extended->projectClose['member']['in'];
                         foreach($teams as $user)
                         {
-                            if($user != $param->PM) $this->saveScore($user, $rule, $module, $method, $desc, $objectID, $time);
+                            if($user != $param->PM) $this->saveScore($user, $rule, $module, $method, $desc, $time);
                         }
                     }
 
@@ -174,7 +170,7 @@ class scoreModel extends model
                 $desc = $this->lang->score->methods[$module][$method];
                 break;
         }
-        $this->saveScore($user, $rule, $module, $method, $desc, $objectID, $time);
+        $this->saveScore($user, $rule, $module, $method, $desc, $time);
     }
 
     /**
@@ -185,13 +181,12 @@ class scoreModel extends model
      * @param string $module
      * @param string $method
      * @param string $desc
-     * @param int    $objectID
      * @param string $time
      *
      * @access private
      * @return bool
      */
-    private function saveScore($account = '', $rule = array(), $module = '', $method = '', $desc = '', $objectID = 0, $time = '')
+    private function saveScore($account = '', $rule = array(), $module = '', $method = '', $desc = '', $time = '')
     {
         if(!empty($rule['times']) || !empty($rule['hour']))
         {
@@ -219,7 +214,6 @@ class scoreModel extends model
         $data->module   = $module;
         $data->method   = $method;
         $data->desc     = $desc;
-        $data->objectID = $objectID;
         $data->before   = $user->score;
         $data->score    = $rule['score'];
         $data->after    = $user->score + $rule['score'];