From 8ecac0f6fb08704ec22f1b094ba29106577a0ee0 Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Tue, 16 Jun 2020 10:49:23 +0800
Subject: [PATCH] * Fix group error.

---
 module/program/model.php          | 1 +
 module/program/view/edit.html.php | 2 +-
 module/project/model.php          | 6 +++++-
 module/user/model.php             | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index 11450ec3b8..b300815f30 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -68,6 +68,7 @@ class programModel extends model
         {
             $programID = $this->dao->lastInsertId();
             $today     = helper::today();
+            if($project->acl != 'open') $this->loadModel('user')->updateUserView($programID, 'program');
 
             /* Save order. */
             $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($programID * 5)->where('id')->eq($programID)->exec();
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 75677bf12f..52c5b9df39 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -89,7 +89,7 @@
           <th><?php echo $lang->project->acl;?></th>
           <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->program->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
         </tr>
-        <tr id='whitelistBox' class='hidden'>
+        <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
           <th><?php echo $lang->project->whitelist;?></th>
           <td colspan='3'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
         </tr>
diff --git a/module/project/model.php b/module/project/model.php
index 46a6653030..83c3a71d4c 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -420,7 +420,11 @@ class projectModel extends model
         if(!dao::isError())
         {
             $this->file->updateObjectID($this->post->uid, $projectID, 'project');
-            if($project->acl != 'open' and ($project->acl != $oldProject->acl or $project->whitelist != $oldProject->whitelist)) $this->loadModel('user')->updateUserView($projectID, 'project');
+            if($project->acl != 'open' and ($project->acl != $oldProject->acl or $project->whitelist != $oldProject->whitelist)) 
+            {
+                $objectType = $oldProject->template ? 'program' : 'project'; 
+                $this->loadModel('user')->updateUserView($projectID, $objectType);
+            }
             return common::createChanges($oldProject, $project);
         }
     }
diff --git a/module/user/model.php b/module/user/model.php
index b579d9ea3f..42f260ff2e 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1489,7 +1489,7 @@ class userModel extends model
             ->where('team.type')->eq('project')
             ->andWhere('project.deleted')->eq(0)
             ->beginIF($objectType == 'product')->andWhere('root')->in($linkedProjects)->fi()
-            ->beginIF($objectType == 'project')->andWhere('root')->eq($objectID)->fi()
+            ->beginIF($objectType == 'project' || $objectType == 'program')->andWhere('root')->eq($objectID)->fi()
             ->query();
         while($team = $stmt->fetch()) $teams[$team->root][$team->account] = $team->account;