From b6b46dca78db4430393a773018a143894d9576ab Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Fri, 4 Mar 2022 13:37:35 +0100
Subject: [PATCH] Also use the same username || email pattern in app.html

---
 src/views/app.html | 2 +-
 src/views/app.js   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/app.html b/src/views/app.html
index 79cafa9d2..4f8dd624d 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -829,7 +829,7 @@
               <div>
                 <div style="margin-left: 20px;">
                   <div class="col-md-5">
-                    {{ 'appstore.installDialog.users' | tr }}: <multiselect name="accessUsersSelect" class="input-sm stretch" ng-model="access.accessRestriction.users" ng-disabled="access.accessRestrictionOption !== 'groups'" options="user.display for user in users" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+                    {{ 'appstore.installDialog.users' | tr }}: <multiselect name="accessUsersSelect" class="input-sm stretch" ng-model="access.accessRestriction.users" ng-disabled="access.accessRestrictionOption !== 'groups'" options="(user.username || user.email)  for user in users" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
                   </div>
 
                   <div class="col-md-5">
diff --git a/src/views/app.js b/src/views/app.js
index 72c150481..aebd48934 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1831,9 +1831,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         Client.getAllUsers(function (error, users) {
             if (error) return callback(error);
 
-            // ensure we have something to work with in the access restriction dropdowns
-            users.forEach(function (user) { user.display = user.username || user.email; });
-
             $scope.users = users;
 
             callback();