diff --git a/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.js b/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.js index 8f6e14e..c0d4432 100755 --- a/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.js +++ b/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.js @@ -12,15 +12,21 @@ frappe.ui.form.on("S3 Backup Settings", { frm.add_custom_button(__("Take Backup Now"), function () { frm.dashboard.set_headline_alert("S3 Backup Started!"); frappe.call({ - method: "offsite_backups.offsite_backups.doctype.s3_backup_settings.s3_backup_settings.take_backups_s3", + method: "offsite_backups.offsite_backups.doctype.s3_backup_settings.s3_backup_settings.take_backup", callback: function (r) { - if (!r.exc) { - frappe.msgprint(__("S3 Backup complete!")); + if (!r.exc && r.message) { + const job_id = r.message; + frappe.msgprint({ + message: __( + "S3 Backup has been queued. You can track the progress here.", + [job_id] + ), + }); frm.dashboard.clear_headline(); } }, }); - }).addClass("btn-primary"); + }); } }, }); diff --git a/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.py b/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.py index d6ec04b..f68bdd9 100755 --- a/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.py +++ b/offsite_backups/offsite_backups/doctype/s3_backup_settings/s3_backup_settings.py @@ -78,12 +78,12 @@ def validate(self): @frappe.whitelist() def take_backup(): """Enqueue longjob for taking backup to s3""" - enqueue( + job = enqueue( "offsite_backups.offsite_backups.doctype.s3_backup_settings.s3_backup_settings.take_backups_s3", queue="long", timeout=1500, ) - frappe.msgprint(_("Queued for backup. It may take a few minutes to an hour.")) + return job.id def take_backups_daily():