Allow to edit admin user

Signed-off-by: GretaD <gretadoci@gmail.com>
nextcloud · Apr 15, 2020 · 262c051 · 262c051
1 parent 95ad9ab
commit 262c051
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 101 deletions.
diff --git a/apps/settings/js/vue-4.js b/apps/settings/js/vue-4.js
diff --git a/apps/settings/js/vue-4.js.map b/apps/settings/js/vue-4.js.map
diff --git a/apps/settings/js/vue-6.js b/apps/settings/js/vue-6.js
diff --git a/apps/settings/js/vue-6.js.map b/apps/settings/js/vue-6.js.map
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -58,7 +58,7 @@
 		</div>
 
 		<div class="userActions">
-			<div v-if="canEdit && !loading.all" class="toggleUserActions">
+			<div v-if="canEditUser(user) && !loading.all" class="toggleUserActions">
 				<Actions>
 					<ActionButton icon="icon-rename" @click="toggleEdit">
 						{{ t('settings', 'Edit User') }}
@@ -82,7 +82,6 @@
 <script>
 import { PopoverMenu, Actions, ActionButton } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
-import { getCurrentUser } from '@nextcloud/auth'
 
 import UserRowMixin from '../../mixins/UserRowMixin'
 export default {
@@ -147,8 +146,8 @@ export default {
 			}
 			return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
 		},
-		canEdit() {
-			return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
+		canEditUser() {
+			return (user) => this.settings.isAdmin || user.id !== OC.getCurrentUser().uid
 		},
 		userQuota() {
 			if (this.user.quota.quota === 'none') {