From 9eda515927f8dcf074a35642ff962390b10559fd Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Tue, 12 Sep 2017 09:49:59 +0800
Subject: [PATCH] * Finish task #3211.

---
 module/project/view/edit.html.php |  6 ++---
 module/testtask/model.php         | 37 ++++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index a4f0646121..d9f2b4f990 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -134,15 +134,15 @@
       <tr>
         <th><?php echo $lang->project->desc;?></th>
         <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='form-control'");?></td>
-      </tr>  
+      </tr>
       <tr>
         <th><?php echo $lang->project->acl;?></th>
         <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
-      </tr>  
+      </tr>
       <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
         <th><?php echo $lang->project->whitelist;?></th>
         <td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist);?></td>
-      </tr>  
+      </tr>
       <tr><td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?></td></tr>
     </table>
   </form>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 25833bf9cf..a94bab9b27 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -90,10 +90,10 @@ class testtaskModel extends model
 
     /**
      * Get test tasks of a product.
-     * 
-     * @param  int    $productID 
-     * @param  string $orderBy 
-     * @param  object $pager 
+     *
+     * @param  int    $productID
+     * @param  string $orderBy
+     * @param  object $pager
      * @access public
      * @return array
      */
@@ -116,7 +116,7 @@ class testtaskModel extends model
         }
         else
         {
-            return $this->dao->select("t1.*, t2.name AS productName, t3.name AS projectName, t4.name AS buildName, if(t4.name != '', t4.branch, t5.branch) AS branch")
+            $testTask = $this->dao->select("t1.*, t2.name AS productName, t3.name AS projectName, t3.acl, t3.whitelist, t4.name AS buildName, if(t4.name != '', t4.branch, t5.branch) AS branch")
                 ->from(TABLE_TESTTASK)->alias('t1')
                 ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
                 ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id')
@@ -131,14 +131,35 @@ class testtaskModel extends model
                 ->orderBy($orderBy)
                 ->page($pager)
                 ->fetchAll('id');
+
+            $projectTeam = $this->dao->select('project, account')->from(TABLE_TEAM)->where('account')->eq($this->app->user->account)->fetchAll('project');
+
+            foreach($testTask as $id => $task)
+            {
+                if($this->app->user->admin) break;
+                if($task->acl == 'open')    continue;
+                if($task->acl == 'private' && array_key_exists($task->project, $projectTeam)) continue;
+                if($task->acl == 'custom')
+                {
+                    $whiteListArray = array();
+                    if(!empty($task->whitelist)) $whiteListArray = explode(',', $task->whitelist);
+
+                    $intersect = array_intersect($whiteListArray, $this->app->user->groups);
+                    if(!empty($intersect)) continue;
+                }
+
+                unset($testTask[$id]);
+            }
+
+            return $testTask;
         }
     }
 
     /**
      * Get test tasks of a project.
-     * 
-     * @param  int    $projectID 
-     * @param  string $orderBy 
+     *
+     * @param  int    $projectID
+     * @param  string $orderBy
      * @param  object $pager 
      * @access public
      * @return array