Merge pull request #20381 from nextcloud/fix/allow_edit_admin_user

Allow to edit admin user
nextcloud · Apr 17, 2020 · 9bd9c2b · 9bd9c2b
2 parents a8809f0 + d17c58e
commit 9bd9c2b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 100 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
@@ -83,7 +83,6 @@
 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 {
 	name: 'UserRowSimple',
@@ -148,7 +147,7 @@ export default {
 			return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
 		},
 		canEdit() {
-			return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
+			return getCurrentUser().uid !== this.user.id || this.settings.isAdmin
 		},
 		userQuota() {
 			if (this.user.quota.quota === 'none') {
@@ -159,7 +158,6 @@ export default {
 			}
 			return OC.Util.humanFileSize(0)
 		},
-
 	},
 	methods: {
 		hideMenu() {