From 3ee5d43c56f2484e51295b9bf4c18b26c8f61816 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 12 Mar 2011 18:13:24 -0500
Subject: [PATCH] Fixing up OPML exporter for anonymous users (just use the
 default account), and fixing the add dialog's focus on the add url, just in
 case it's slow to load.

---
 apps/feed_import/views.py            | 6 +++---
 media/js/newsblur/reader_add_feed.js | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py
index a36ea70ac..b0dd9e251 100644
--- a/apps/feed_import/views.py
+++ b/apps/feed_import/views.py
@@ -14,7 +14,7 @@ from apps.reader.forms import SignupForm
 from apps.reader.models import UserSubscription
 from apps.feed_import.models import OAuthToken, OPMLImporter, OPMLExporter, GoogleReaderImporter
 from utils import json_functions as json
-from utils.user_functions import ajax_login_required
+from utils.user_functions import ajax_login_required, get_user
 
 
 @ajax_login_required
@@ -44,9 +44,9 @@ def opml_upload(request):
     data = json.encode(dict(message=message, code=code, payload=payload))
     return HttpResponse(data, mimetype='text/plain')
 
-@ajax_login_required
 def opml_export(request):
-    exporter = OPMLExporter(request.user)
+    user     = get_user(request)
+    exporter = OPMLExporter(user)
     opml     = exporter.process()
     now      = datetime.datetime.now()
     
diff --git a/media/js/newsblur/reader_add_feed.js b/media/js/newsblur/reader_add_feed.js
index 3c31d3e4c..d2be5bd9f 100644
--- a/media/js/newsblur/reader_add_feed.js
+++ b/media/js/newsblur/reader_add_feed.js
@@ -144,7 +144,9 @@ NEWSBLUR.ReaderAddFeed.prototype = {
             'onOpen': function (dialog) {
                 dialog.overlay.fadeIn(200, function () {
                     dialog.container.fadeIn(200);
-                    dialog.data.fadeIn(200);
+                    dialog.data.fadeIn(200, function() {
+                        self.focus_add_feed();
+                    });
                 });
             },
             'onShow': function(dialog) {