Fix default quota display value in user row

When selecting default quota in the dropdown, the actual numeric value
or "Unlimited" will be displayed instead of "0 B". This matches whatever
is displayed after refreshing the page.

In the case where the default quota is unlimited, for which the server
returns -3 instead of "none", the frontend now also shows "Unlimited"
instead of "0 B".

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
pull/23711/head
Vincent Petry 5 years ago
parent 25f347a49a
commit 66ce56e424
No known key found for this signature in database
GPG Key ID: E055D6A4D513575C
  1. 4
      apps/settings/js/vue-settings-apps-users-management.js
  2. 2
      apps/settings/js/vue-settings-apps-users-management.js.map
  3. 4
      apps/settings/js/vue-settings-users-6f9e88f5293a6b124009.js
  4. 1
      apps/settings/js/vue-settings-users-6f9e88f5293a6b124009.js.map
  5. 1
      apps/settings/js/vue-settings-users-c196f5ddb6c1942e5d3f.js.map
  6. 2
      apps/settings/js/vue-vendors-settings-apps-7090e887d9ed9caa6ee1.js
  7. 1
      apps/settings/js/vue-vendors-settings-apps-7090e887d9ed9caa6ee1.js.map
  8. 2
      apps/settings/js/vue-vendors-settings-apps-settings-users-86b1333e4e6b516f6617.js
  9. 1
      apps/settings/js/vue-vendors-settings-apps-settings-users-86b1333e4e6b516f6617.js.map
  10. 2
      apps/settings/js/vue-vendors-settings-users-e3c08b7d1cc0f8effd19.js
  11. 1
      apps/settings/js/vue-vendors-settings-users-e3c08b7d1cc0f8effd19.js.map
  12. 18
      apps/settings/src/components/UserList/UserRowSimple.vue

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -154,11 +154,21 @@ export default {
return getCurrentUser().uid !== this.user.id || this.settings.isAdmin
},
userQuota() {
if (this.user.quota.quota === 'none') {
return t('settings', 'Unlimited')
let quota = this.user.quota.quota
if (quota === 'default') {
quota = this.settings.defaultQuota
if (quota !== 'none') {
// convert to numeric value to match what the server would usually return
quota = OC.Util.computerFileSize(quota)
}
}
if (this.user.quota.quota >= 0) {
return OC.Util.humanFileSize(this.user.quota.quota)
// when the default quota is unlimited, the server returns -3 here, map it to "none"
if (quota === 'none' || quota === -3) {
return t('settings', 'Unlimited')
} else if (quota >= 0) {
return OC.Util.humanFileSize(quota)
}
return OC.Util.humanFileSize(0)
},

Loading…
Cancel
Save