From 6ed2466785aa97356ab1cceaa959f97a85023941 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Fri, 28 Apr 2017 12:15:01 +0300
Subject: [PATCH 1/2] Fixed nginx routing rules

---
 install/core/config.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/install/core/config.php b/install/core/config.php
index e455086fea..4291199dc3 100644
--- a/install/core/config.php
+++ b/install/core/config.php
@@ -77,12 +77,26 @@ service apache2 restart',
 
     client_max_body_size 50M;
 
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
     location /api/v1/ {
         if (!-e $request_filename){
             rewrite ^/api/v1/(.*)$ /api/v1/index.php last; break;
         }
     }
 
+    location /portal/ {
+        try_files $uri $uri/ /portal/index.php?$query_string;
+    }
+
+    location /api/v1/portal-access {
+        if (!-e $request_filename){
+            rewrite ^/api/v1/(.*)$ /api/v1/portal-access/index.php last; break;
+        }
+    }
+
     location ~ /reset/?$ {
         try_files /reset.html =404;
     }

From ba05c45f47013f04af0108c80c2785b1a4b256d0 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Fri, 28 Apr 2017 17:02:16 +0300
Subject: [PATCH 2/2] EntityManager: fixed translated options

---
 client/src/views/admin/field-manager/fields/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/views/admin/field-manager/fields/options.js b/client/src/views/admin/field-manager/fields/options.js
index f6049e2da5..6f56b307d6 100644
--- a/client/src/views/admin/field-manager/fields/options.js
+++ b/client/src/views/admin/field-manager/fields/options.js
@@ -49,7 +49,7 @@ Espo.define('views/admin/field-manager/fields/options', 'views/fields/array', fu
             var html = '' +
             '<div class="list-group-item link-with-role form-inline" data-value="' + valueSanitized + '">' +
                 '<div class="pull-left" style="width: 92%; display: inline-block;">' +
-                    '<input name="translatedValue" data-value="' + valueSanitized + '" class="role form-control input-sm pull-right" value="'+valueSanitized+'">' +
+                    '<input name="translatedValue" data-value="' + valueSanitized + '" class="role form-control input-sm pull-right" value="'+translatedValue+'">' +
                     '<div>' + valueSanitized + '</div>' +
                 '</div>' +
                 '<div style="width: 8%; display: inline-block; vertical-align: top;">' +