Merge branch 'master' of https://github.com/easysoft/zentaopms

2020-08-06 16:29:16 +08:00
parent 904543b48f dc04c92b2c
commit 217b456bf9
73 changed files with 418 additions and 164 deletions
@@ -843,7 +843,7 @@ class bug extends control
            $appendUsers[$bug->assignedTo] = $bug->assignedTo;
            $appendUsers[$bug->resolvedBy] = $bug->resolvedBy;
        }
-        $users = $this->user->getPairs('devfirst|nodeleted', $appendUsers);
+        $users = $this->user->getPairs('devfirst|nodeleted', $appendUsers, $this->config->maxCount);
        $users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;

        /* Assign. */