user acl fixes

2017-01-23 13:27:59 +02:00
parent 9d238d270e
commit 7649f4d680
1 changed files with 15 additions and 0 deletions
@@ -40,6 +40,14 @@ class User extends \Espo\Core\SelectManagers\Base
                'isActive' => true
            );
        }
+        if ($this->getAcl()->get('portalPermission') !== 'yes') {
+            $result['whereClause'][] = array(
+                'OR' => [
+                    ['isPortalUser' => false],
+                    ['id' => $this->getUser()->id]
+                ]
+            );
+        }
        $result['whereClause'][] = array(
            'isSuperAdmin' => false
        );
@@ -91,6 +99,13 @@ class User extends \Espo\Core\SelectManagers\Base
        );
    }

+    protected function accessPortalOnlyOwn(&$result)
+    {
+        $result['whereClause'][] = array(
+            'id' => $this->getUser()->id
+        );
+    }
+
    protected function accessOnlyTeam(&$result)
    {
        $this->setDistinct(true, $result);