From 84b1280ab045e73233b3f7ee50ff914cc7fe2253 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 29 Jun 2021 16:05:16 +0800
Subject: [PATCH]  * Adjust save user acl.

---
 module/action/model.php | 2 +-
 module/user/model.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 3a1d42fc91..5c3835ae4b 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -759,7 +759,7 @@ class actionModel extends model
         if(is_numeric($projectID)) $executions = $this->loadModel('execution')->getPairs($projectID);
 
         $this->loadModel('doc');
-        $libs = $this->doc->getLibs('includeDeleted');
+        $libs = $this->doc->getLibs('includeDeleted') + array('' => '');
         $docs = $this->doc->getPrivDocs(array_keys($libs), 0, 'all');
 
         $actionCondition = $this->getActionCondition();
diff --git a/module/user/model.php b/module/user/model.php
index 2c29b4ff87..b4d9a6f12c 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -926,8 +926,8 @@ class userModel extends model
                 if(!empty($acl['projects'])) $acls['projects'] = !empty($acls['projects']) ? array_merge($acls['projects'], $acl['projects']) : $acl['projects'];
                 if(!empty($acl['products'])) $acls['products'] = !empty($acls['products']) ? array_merge($acls['products'], $acl['products']) : $acl['products'];
                 if(!empty($acl['sprints']))  $acls['sprints']  = !empty($acls['sprints'])  ? array_merge($acls['sprints'],  $acl['sprints'])  : $acl['sprints'];
+                if(!empty($acl['actions']))  $acls['actions']  = !empty($acls['actions'])  ? array_merge($acl['actions'], $acls['actions']) : $acl['actions'];
                 if(!empty($acl['views']))    $acls['views']    = array_merge($acls['views'], $acl['views']);
-                if(!empty($acl['actions']))  $acls['actions']  = !empty($acls['actions']) ? ($acl['actions'] + $acls['actions']) : $acl['actions'];
             }
 
             if($programAllow) $acls['programs'] = array();