From acf8fd1adcb07a76f54ee7f343cdfcdd0c0f4db1 Mon Sep 17 00:00:00 2001 From: Doridel Cahanap Date: Mon, 3 Sep 2018 07:27:03 +0200 Subject: [PATCH] Fix Backup Issue (#6039) --- .../doctype/dropbox_settings/dropbox_settings.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py index f2cdded375..41c2919848 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -106,7 +106,7 @@ def backup_to_dropbox(upload_db_backup=True): dropbox_client = dropbox.Dropbox(dropbox_settings['access_token']) - if not upload_db_backup: + if upload_db_backup: backup = new_backup(ignore_files=True) filename = os.path.join(get_backups_path(), os.path.basename(backup.backup_path_db)) upload_file_to_dropbox(filename, "/database", dropbox_client) @@ -133,10 +133,12 @@ def upload_from_folder(path, is_private, dropbox_folder, dropbox_client, did_not path = text_type(path) for f in frappe.get_all("File", filters={"is_folder": 0, "is_private": is_private, - "uploaded_to_dropbox": 0}, fields=['file_url', 'name']): + "uploaded_to_dropbox": 0}, fields=['file_url', 'name', 'file_name']): if is_private: filename = f.file_url.replace('/private/files/', '') else: + if not f.file_url: + f.file_url = '/files/' + f.file_name; filename = f.file_url.replace('/files/', '') filepath = os.path.join(path, filename)