Merge branch 'sprint/182_liumengyi_fixbug' into 'master'

* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.

See merge request easycorp/zentaopms!1444

module/project/control.php

@@ -530,6 +530,7 @@ class project extends control
         $project   = $this->project->getByID($projectID);
         $programID = $project->parent;
         $this->project->setMenu($projectID);
+        if($project->model == 'kanban') unset($this->lang->project->authList['reset']);
 
         if($_POST)
         {

module/project/view/index.html.php

@@ -84,13 +84,13 @@
               <div class='kanban-members pull-left'>
                 <?php $count = 0;?>
                 <?php foreach($members as $member):?>
-                <?php if($count > 2) break;?>
+                <?php if($count > 1) break;?>
                 <?php $count ++;?>
                 <div title="<?php echo $member->realname;?>">
                   <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$member->account], 'account' => $member->account)); ?>
                 </div>
                 <?php endforeach;?>
-                <?php if(count($members) > 4):?>
+                <?php if(count($members) > 3):?>
                 <?php echo '<span>…</span>';?>
                 <?php $lastMember = end($members);?>
                 <div title="<?php echo $lastMember->realname;?>">