Signed-off-by: Fiona Ebner <f.eb...@proxmox.com>
---
www/manager6/controller/StorageEdit.js | 12 ------------
www/manager6/dc/Backup.js | 7 -------
www/manager6/dc/BackupJobDetail.js | 4 +---
www/manager6/panel/BackupJobPrune.js | 5 +----
www/manager6/storage/Base.js | 5 -----
5 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/www/manager6/controller/StorageEdit.js
b/www/manager6/controller/StorageEdit.js
index 384f9ab4..1acadbe3 100644
--- a/www/manager6/controller/StorageEdit.js
+++ b/www/manager6/controller/StorageEdit.js
@@ -9,18 +9,6 @@ Ext.define('PVE.controller.StorageEdit', {
if (prealloc) {
prealloc.setDisabled(!hasImages);
}
-
- var hasBackups = Ext.Array.contains(value, 'backup');
- var maxfiles = this.lookupReference('maxfiles');
- if (!maxfiles) {
- return;
- }
-
- if (!hasBackups) {
- // clear values which will never be submitted
- maxfiles.reset();
- }
- maxfiles.setDisabled(!hasBackups);
},
},
},
diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index 0ad49568..dff588b2 100644
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -167,13 +167,6 @@ Ext.define('PVE.dc.BackupEdit', {
if (data['prune-backups']) {
Object.assign(data, data['prune-backups']);
delete data['prune-backups'];
- } else if (data.maxfiles !== undefined) {
- if (data.maxfiles > 0) {
- data['keep-last'] = data.maxfiles;
- } else {
- data['keep-all'] = 1;
- }
- delete data.maxfiles;
}
if (data['notes-template']) {
diff --git a/www/manager6/dc/BackupJobDetail.js
b/www/manager6/dc/BackupJobDetail.js
index 67ec5273..86a593b3 100644
--- a/www/manager6/dc/BackupJobDetail.js
+++ b/www/manager6/dc/BackupJobDetail.js
@@ -371,12 +371,10 @@ Ext.define('PVE.dc.BackupInfo', {
}
});
- if (values['prune-backups'] || values.maxfiles !== undefined) {
+ if (values['prune-backups']) {
let keepValues;
if (values['prune-backups']) {
keepValues = values['prune-backups'];
- } else if (values.maxfiles > 0) {
- keepValues = { 'keep-last': values.maxfiles };
} else {
keepValues = { 'keep-all': 1 };
}
diff --git a/www/manager6/panel/BackupJobPrune.js
b/www/manager6/panel/BackupJobPrune.js
index 960142b5..cf34ea83 100644
--- a/www/manager6/panel/BackupJobPrune.js
+++ b/www/manager6/panel/BackupJobPrune.js
@@ -35,10 +35,7 @@ Ext.define('PVE.panel.BackupJobPrune', {
options['prune-backups'] = retention;
}
- if (!this.isCreate) {
- // always delete old 'maxfiles' on edit, we map it to keep-last on
window load
- options.delete.push('maxfiles');
- } else {
+ if (this.isCreate) {
delete options.delete;
}
diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js
index d945cf79..a3177faa 100644
--- a/www/manager6/storage/Base.js
+++ b/www/manager6/storage/Base.js
@@ -186,11 +186,6 @@ Ext.define('PVE.storage.BaseEdit', {
let retention =
PVE.Parser.parsePropertyString(values['prune-backups']);
delete values['prune-backups'];
Object.assign(values, retention);
- } else if (values.maxfiles !== undefined) {
- if (values.maxfiles > 0) {
- values['keep-last'] = values.maxfiles;
- }
- delete values.maxfiles;
}
me.query('inputpanel').forEach((panel) => {
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
