diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html index d74e70ea6..4e21fd597 100644 --- a/webadmin/src/views/apps.html +++ b/webadmin/src/views/apps.html @@ -49,7 +49,7 @@

This is a single user application.

- Access is granted to {{appConfigure.app.accessRestriction.users[0]}}. + Access is granted to {{ renderAccessRestrictionUser(appConfigure.app.accessRestriction.users[0]) }}.

diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js index 0424b02bc..51db25cc6 100644 --- a/webadmin/src/views/apps.js +++ b/webadmin/src/views/apps.js @@ -408,6 +408,15 @@ angular.module('Application').controller('AppsController', ['$scope', '$location }); }; + $scope.renderAccessRestrictionUser = function (userId) { + var user = $scope.users.filter(function (u) { return u.id === userId; })[0]; + + // user not found + if (!user) return userId; + + return user.username ? user.username : user.email; + }; + $scope.cancel = function () { window.history.back(); }; @@ -434,10 +443,14 @@ angular.module('Application').controller('AppsController', ['$scope', '$location }); } - if ($scope.user.admin) { - fetchUsers(); - fetchGroups(); - } + Client.refreshUserInfo(function (error) { + if (error) return console.error(error); + + if ($scope.user.admin) { + fetchUsers(); + fetchGroups(); + } + }); // setup all the dialog focus handling ['appConfigureModal', 'appUninstallModal', 'appUpdateModal', 'appRestoreModal'].forEach(function (id) {