From b8109ba431e68c7d89b2f0bde675e4a193d13946 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 18 May 2012 02:45:36 +0000 Subject: [PATCH] import/export updates; all appear to work on web svn: r19569 --- src/webapp/grampsdb/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/webapp/grampsdb/views.py b/src/webapp/grampsdb/views.py index 613c347df..52e6420d6 100644 --- a/src/webapp/grampsdb/views.py +++ b/src/webapp/grampsdb/views.py @@ -48,6 +48,7 @@ from webapp.grampsdb.models import * from webapp.grampsdb.forms import * from webapp.dbdjango import DbDjango from webapp.libdjango import DjangoInterface +import cli.user dji = DjangoInterface() @@ -339,7 +340,7 @@ def process_action(request, view, handle, action): mimetype = 'application/%s' % args["off"] elif report.report_type == "export": filename = "/tmp/%s-%s.%s" % (str(profile.user.username), str(handle), args["off"]) - export_file(db, filename, lambda n: n) # callback + export_file(db, filename, cli.user.User()) # callback mimetype = 'text/plain' elif report.report_type == "import": filename = download(args["i"], "/tmp/%s-%s.%s" % (str(profile.user.username), @@ -350,7 +351,7 @@ def process_action(request, view, handle, action): import threading def background(): try: - import_file(db, filename, lambda n: n) # callback + import_file(db, filename, gui.user.User()) # callback except: message = "import_file failed: " + traceback.format_exc() request.user.message_set.create(message = message) @@ -359,7 +360,7 @@ def process_action(request, view, handle, action): request.user.message_set.create(message = message) return redirect("/report/") else: - success = import_file(db, filename, lambda n: n) # callback + success = import_file(db, filename, gui.user.User()) # callback if not success: message = "Failed to load imported." request.user.message_set.create(message = message)