Fix default quota setting of 0 B
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
parent
3d42d4c9dc
commit
b09f0741ba
|
@ -187,9 +187,9 @@ export default {
|
|||
validateQuota(quota) {
|
||||
// only used for new presets sent through @Tag
|
||||
let validQuota = OC.Util.computerFileSize(quota);
|
||||
if (validQuota === 0) {
|
||||
if (validQuota === null) {
|
||||
return this.setDefaultQuota('none');
|
||||
} else if (validQuota !== null) {
|
||||
} else {
|
||||
// unify format output
|
||||
return this.setDefaultQuota(OC.Util.humanFileSize(OC.Util.computerFileSize(quota)));
|
||||
}
|
||||
|
@ -295,7 +295,7 @@ export default {
|
|||
if (this.selectedQuota !== false) {
|
||||
return this.selectedQuota;
|
||||
}
|
||||
if (OC.Util.computerFileSize(this.settings.defaultQuota) > 0) {
|
||||
if (this.settings.defaultQuota !== this.unlimitedQuota.id && OC.Util.computerFileSize(this.settings.defaultQuota) >= 0) {
|
||||
// if value is valid, let's map the quotaOptions or return custom quota
|
||||
return {id:this.settings.defaultQuota, label:this.settings.defaultQuota};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue