Merge pull request #11417 from nextcloud/hover-quota-used-space-regre…

…ssion Add back the total used space per user
nextcloud · Sep 28, 2018 · ecf33a6 · ecf33a6
2 parents 9eb4259 + 8a2ac44
commit ecf33a6
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 17 deletions.
diff --git a/settings/js/settings-vue.js b/settings/js/settings-vue.js
diff --git a/settings/js/settings-vue.js.map b/settings/js/settings-vue.js.map
diff --git a/settings/package-lock.json b/settings/package-lock.json
diff --git a/settings/package.json b/settings/package.json
@@ -1,7 +1,7 @@
 {
   "name": "settings",
   "description": "Nextcloud settings",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "John Molakvoæ (skjnldsv) <[email protected]>",
   "license": "AGPL3",
   "private": true,

diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue
@@ -84,7 +84,7 @@
 				<span slot="noResult">{{t('settings', 'No results')}}</span>
 			</multiselect>
 		</div>
-		<div class="quota" :class="{'icon-loading-small': loading.quota}">
+		<div class="quota" :class="{'icon-loading-small': loading.quota}" v-tooltip.auto="usedSpace">
 			<multiselect :value="userQuota" :options="quotaOptions" :disabled="loading.quota||loading.all"
 						 tag-placeholder="create" :placeholder="t('settings', 'Select user quota')"
 						 label="label" track-by="id" class="multiselect-vue"
@@ -215,6 +215,12 @@ export default {
 		},
 
 		/* QUOTA MANAGEMENT */
+		usedSpace() {
+			if (this.user.quota.used) {
+				return t('settings', '{size} used', {size: OC.Util.humanFileSize(this.user.quota.used)});
+			}
+			return t('settings', '{size} used', {size: OC.Util.humanFileSize(0)});
+		},
 		usedQuota() {
 			let quota = this.user.quota.quota;
 			if (quota > 0) {

diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
@@ -90,7 +90,7 @@ public static function rowForUser($user) {
 	 * @return Locator
 	 */
 	public static function classCellForUser($class, $user) {
-		return Locator::forThe()->xpath("//*[@class='$class']")->
+		return Locator::forThe()->xpath("//*[contains(concat(' ', normalize-space(@class), ' '), ' $class ')]")->
 				descendantOf(self::rowForUser($user))->
 				describedAs("$class cell for user $user in Users Settings");
 	}