nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] [fix] dropbox

Browse Source
This commit is contained in:
Anand Doshi
2013-11-18 13:49:41 +05:30
parent 0809a95a70
commit 1d55be86b2
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
setup/doctype/backup_manager/backup_dropbox.py
View File

@@ -64,6 +64,9 @@ def dropbox_callback(oauth_token=None, not_approved=False):
webnotes.local.message_title = "Dropbox Approval" webnotes.local.message_title = "Dropbox Approval"
webnotes.local.message = "<h3>%s</h3><p>Please close this window.</p>" % message webnotes.local.message = "<h3>%s</h3><p>Please close this window.</p>" % message
if allowed:
webnotes.local.message_success = True
webnotes.conn.commit() webnotes.conn.commit()
webnotes.response['type'] = 'page' webnotes.response['type'] = 'page'
webnotes.response['page_name'] = 'message.html' webnotes.response['page_name'] = 'message.html'
@@ -109,9 +112,9 @@ def backup_to_dropbox():
if not found: if not found:
try: try:
upload_file_to_dropbox(filepath, "/files", dropbox_client) upload_file_to_dropbox(filepath, "/files", dropbox_client)
except Exception, e: except Exception:
did_not_upload.append(filename) did_not_upload.append(filename)
error_log.append(cstr(e)) error_log.append(webnotes.getTraceback())
webnotes.connect() webnotes.connect()
return did_not_upload, list(set(error_log)) return did_not_upload, list(set(error_log))

4
setup/doctype/backup_manager/backup_manager.py
View File

@@ -39,6 +39,10 @@ def take_backups_dropbox():
file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)] file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)]
error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback()) error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback())
webnotes.errprint(error_message) webnotes.errprint(error_message)
if not webnotes.conn:
webnotes.connect()
send_email(False, "Dropbox", error_message) send_email(False, "Dropbox", error_message)
#backup to gdrive #backup to gdrive