Merge branch 'hotfix/4.6.1' of ssh://172.20.0.1/var/git/espo/backend into hotfix/4.6.1

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;">' +

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;
     }