Merge pull request #19882 from nextcloud/backport/18555/stable18

[stable18] Allow to edit admin/own user in the user management
nextcloud · Mar 12, 2020 · b54fdae · b54fdae
2 parents 126ad33 + e8a069e
commit b54fdae
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 28 deletions.
diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
@@ -1418,6 +1418,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	#app-content.user-list-grid {
 		display: grid;
 		grid-column-gap: 20px;
+		grid-auto-rows: minmax(60px, max-content);
 
 		.row {
 			// TODO replace with css4 subgrid when available
@@ -1561,10 +1562,12 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 			}
 
 			> div,
+			> .displayName > form,
 			> form {
 				grid-row: 1;
 				display: inline-flex;
 				color: var(--color-text-lighter);
+				flex-grow: 1;
 
 				> input:not(:focus):not(:active) {
 					border-color: transparent;
@@ -1591,6 +1594,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 				&.mailAddress {
 					> input {
 						text-overflow: ellipsis;
+						flex-grow: 1;
 					}
 				}
 

diff --git a/apps/settings/js/vue-0.js b/apps/settings/js/vue-0.js
diff --git a/apps/settings/js/vue-0.js.map b/apps/settings/js/vue-0.js.map
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-5.js b/apps/settings/js/vue-5.js
diff --git a/apps/settings/js/vue-5.js.map b/apps/settings/js/vue-5.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-7.js b/apps/settings/js/vue-7.js
diff --git a/apps/settings/js/vue-7.js.map b/apps/settings/js/vue-7.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.vue b/apps/settings/src/components/UserList.vue
@@ -318,7 +318,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.getCurrentUser().uid)
+				return this.users.filter(user => user.enabled !== false)
 			}
 			return this.users.filter(user => user.enabled !== false)
 		},

diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
@@ -216,7 +216,7 @@
 		<div v-if="showConfig.showLastLogin" />
 
 		<div class="userActions">
-			<div v-if="OC.currentUser !== user.id && user.id !== 'admin' && !loading.all"
+			<div v-if="!loading.all"
 				class="toggleUserActions">
 				<Actions>
 					<ActionButton icon="icon-checkmark"

diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -55,7 +55,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') }}
@@ -79,7 +79,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 {
@@ -144,10 +143,9 @@ 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
 		},
-
 	},
 	methods: {
 		hideMenu() {