Accepting incoming merge; receiving new svn:ignore property to ignore test import...

[osqa.git] / forum_modules / exporter / views.py

diff --git a/forum_modules/exporter/views.py b/forum_modules/exporter/views.py
index 947d8efab748573d917948008e75b6a279d73d1a..37090372dbba0b86450e9d5117aacb108610f0a3 100644 (file)
--- a/forum_modules/exporter/views.py
+++ b/forum_modules/exporter/views.py
@@ -22,7 +22,7 @@ def exporter(request):
     state = cache.get(CACHE_KEY)
 
     if state and state['running']:
-        return HttpResponseRedirect(reverse('exporter_running'))
+        return HttpResponseRedirect(reverse('exporter_running', kwargs=dict(mode='exporter')))
 
     if request.method == 'POST':
         form = ExporterForm(request.POST)
@@ -32,7 +32,7 @@ def exporter(request):
             thread.setDaemon(True)
             thread.start()
 
-            return HttpResponseRedirect(reverse('exporter_running'))
+            return HttpResponseRedirect(reverse('exporter_running', kwargs=dict(mode='exporter')))
     else:
         form = ExporterForm()
 
@@ -62,12 +62,13 @@ def exporter(request):
     })
 
 @admin_page
-def running(request):
+def running(request, mode):
     state = cache.get(CACHE_KEY)
     if state is None:
         return HttpResponseRedirect(reverse('admin_tools', args=[_('exporter')]))
 
     return ('modules/exporter/running.html', {
+        'mode': mode,
         'steps': EXPORT_STEPS
     })
 
@@ -87,12 +88,4 @@ def download(request):
     return response
 
 
-@admin_page
-def importer(request):
-    start_import('/Users/admin/dev/pyenv/osqa/maintain/forum_modules/exporter/backups/localhost-201010121118.tar.gz', request.user)
-
-    return ('modules/exporter/importer.html', {
-
-    })
 
-