diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-05-07 20:29:51 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-05-08 09:44:51 +0200 |
| commit | 278c281cc9c03ad060ac6a91784058066411c7a8 (patch) | |
| tree | d82e5fda75a9811bc2e280f3933cc36a99ff9e4b /settings/src | |
| parent | a3800a6810fca68eff1789dc21488389bf22108a (diff) | |
| download | nextcloud-server-278c281cc9c03ad060ac6a91784058066411c7a8.tar.gz nextcloud-server-278c281cc9c03ad060ac6a91784058066411c7a8.zip | |
Deprecate oc_current_user, fix usage and move currentUser to the bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/userList.vue | 2 | ||||
| -rw-r--r-- | settings/src/main-apps-users-management.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue index a9c7391d0e1..27a5e520897 100644 --- a/settings/src/components/userList.vue +++ b/settings/src/components/userList.vue @@ -212,7 +212,7 @@ export default { } if (!this.settings.isAdmin) { // we don't want subadmins to edit themselves - return this.users.filter(user => user.enabled !== false && user.id !== oc_current_user); + return this.users.filter(user => user.enabled !== false && user.id !== OC.getCurrentUser().uid); } return this.users.filter(user => user.enabled !== false); }, diff --git a/settings/src/main-apps-users-management.js b/settings/src/main-apps-users-management.js index e3149cabaf2..a23887458c9 100644 --- a/settings/src/main-apps-users-management.js +++ b/settings/src/main-apps-users-management.js @@ -47,7 +47,6 @@ Vue.prototype.t = t; Vue.prototype.OC = OC; Vue.prototype.OCA = OCA; Vue.prototype.oc_userconfig = oc_userconfig; -Vue.prototype.oc_current_user = oc_current_user; const app = new Vue({ router, |