From 39a3a6dbd21a391e276eae89a98f74437acf0504 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Mon, 29 Oct 2018 10:15:37 +0200
Subject: [PATCH 1/3] users nonAdminReadOnlyAttributeList

---
 application/Espo/Controllers/User.php | 14 ++++++++++++++
 application/Espo/Services/User.php    |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/application/Espo/Controllers/User.php b/application/Espo/Controllers/User.php
index 77da4c47e2..26253a2459 100644
--- a/application/Espo/Controllers/User.php
+++ b/application/Espo/Controllers/User.php
@@ -105,5 +105,19 @@ class User extends \Espo\Core\Controllers\Record
 
         return $this->getService('User')->passwordChangeRequest($userName, $emailAddress, $url);
     }
+
+    public function actionCreateLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return parent::actionCreateLink($params, $data, $request);
+    }
+
+    public function actionRemoveLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return parent::actionRemoveLink($params, $data, $request);
+    }
 }
 
diff --git a/application/Espo/Services/User.php b/application/Espo/Services/User.php
index 32efdced73..b69be16a63 100644
--- a/application/Espo/Services/User.php
+++ b/application/Espo/Services/User.php
@@ -55,7 +55,10 @@ class User extends Record
         'isAdmin',
         'isPortalUser',
         'teamsIds',
+        'teamsColumns',
+        'teamsNames',
         'rolesIds',
+        'rolesNames',
         'password',
         'portalsIds',
         'portalRolesIds',

From 96538a2b6f9c936970905c845f5d72967598a5cb Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Mon, 22 Oct 2018 16:30:39 +0300
Subject: [PATCH 2/3] fix order by address

---
 application/Espo/Core/SelectManagers/Base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/Espo/Core/SelectManagers/Base.php b/application/Espo/Core/SelectManagers/Base.php
index 948d118116..94d5354753 100644
--- a/application/Espo/Core/SelectManagers/Base.php
+++ b/application/Espo/Core/SelectManagers/Base.php
@@ -150,7 +150,7 @@ class Base
                 } else {
                     $orderPart = 'DESC';
                 }
-                $result['orderBy'] = [[$sortBy . 'Country', $orderPart], [$sortBy . 'City', $orderPart], [$sortBy . '_eet', $orderPart]];
+                $result['orderBy'] = [[$sortBy . 'Country', $orderPart], [$sortBy . 'City', $orderPart], [$sortBy . 'Street', $orderPart]];
                 return;
             } else if ($type === 'enum') {
                 $list = $this->getMetadata()->get(['entityDefs', $this->getEntityType(), 'fields', $sortBy, 'options']);

From 374413eaaedc34eba239b6c1182b6aed91b8aa21 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Mon, 29 Oct 2018 10:23:19 +0200
Subject: [PATCH 3/3] version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a1eb5d2f19..659a2c8e5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "5.4.4",
+  "version": "5.4.5",
   "description": "",
   "main": "index.php",
   "repository": {