From d949e4e8e5b5c86ed5acca0fd3fa05dffae29e79 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Fri, 27 Nov 2020 18:19:33 +0800
Subject: [PATCH] * Finish task#8500. Remove the question list button under the
 scrum module.

---
 module/stakeholder/control.php          | 2 +-
 module/stakeholder/model.php            | 3 ++-
 module/stakeholder/view/browse.html.php | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php
index 558096159e..ffd7dce67a 100644
--- a/module/stakeholder/control.php
+++ b/module/stakeholder/control.php
@@ -17,7 +17,7 @@ class stakeholder extends control
         $this->app->loadClass('pager', true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
-        $stakeholders = $this->stakeholder->getStakeHolders($browseType, $orderBy, $pager);
+        $stakeholders = $this->stakeholder->getStakeholders($browseType, $orderBy, $pager);
 
         $this->view->title       = $this->lang->stakeholder->browse;
         $this->view->position[]  = $this->lang->stakeholder->browse;
diff --git a/module/stakeholder/model.php b/module/stakeholder/model.php
index 3cf8cbc428..f99e90ebfb 100644
--- a/module/stakeholder/model.php
+++ b/module/stakeholder/model.php
@@ -198,9 +198,10 @@ class stakeholderModel extends model
      */
     public function getStakeholders($browseType = 'all', $orderBy = 'id_desc', $pager = null)
     {
-        $stakeholders = $this->dao->select('t1.*, t2.phone, t2.realname as name, t2.email, t2.qq, t2.weixin, t2.nature, t2.analysis, t2.strategy, t3.name as companyName')->from(TABLE_STAKEHOLDER)->alias('t1')
+        $stakeholders = $this->dao->select('t1.*, t2.phone, t2.realname as name, t2.email, t2.qq, t2.weixin, t2.nature, t2.analysis, t2.strategy, t3.name as companyName, t4.model as projectModel')->from(TABLE_STAKEHOLDER)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
             ->leftJoin(TABLE_COMPANY)->alias('t3')->on('t2.company=t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.objectID=t4.id')
             ->where('t1.deleted')->eq('0')
             ->andWhere('t1.objectID')->eq($this->session->PRJ)
             ->beginIF($browseType == 'inside')->andWhere('t1.type')->eq('inside')->fi()
diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php
index c063401cb5..c9cab434e2 100644
--- a/module/stakeholder/view/browse.html.php
+++ b/module/stakeholder/view/browse.html.php
@@ -38,7 +38,7 @@
           <th class="w-120px"><?php echo $lang->stakeholder->qq;?></th>
           <th class="w-120px"><?php echo $lang->stakeholder->weixin;?></th>
           <th class="w-200px"><?php echo $lang->stakeholder->email;?></th>
-          <th class='c-actions w-160px'><?php echo $lang->actions;?></th>
+          <th class='c-actions text-center w-150px'><?php echo $lang->actions;?></th>
         </tr>
         </thead>
         <tbody>
@@ -60,7 +60,7 @@
             <?php
             common::printIcon('stakeholder', 'communicate', "id=$stakeholder->id", $stakeholder, 'list', 'chat-line', '', 'iframe', 'yes');
             common::printIcon('stakeholder', 'expect', "id=$stakeholder->id", $stakeholder, 'list', 'flag', '', 'iframe', 'yes');
-            common::printIcon('stakeholder', 'userIssue', "account=$stakeholder->id", $stakeholder, 'list', 'list-alt', '', 'iframe', 'yes');
+            if($stakeholder->projectModel == 'waterfall') common::printIcon('stakeholder', 'userIssue', "account=$stakeholder->id", $stakeholder, 'list', 'list-alt', '', 'iframe', 'yes');
             common::printIcon('stakeholder', 'edit', "id=$stakeholder->id", $stakeholder, 'list', '', '', '', '');
             $deleteClass = common::hasPriv('stakeholder', 'delete') ? 'btn' : 'btn disabled';
             echo html::a($this->createLink('stakeholder', 'delete', "id=$stakeholder->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->stakeholder->delete}' class='{$deleteClass}'");