From 8aa50201ebaf0e44ceca641f1d10746b2be22ca7 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Mon, 10 Feb 2014 12:55:56 -0800 Subject: [PATCH] Fixing add new subscription action to use correct folders. --- apps/oauth/views.py | 5 ++++- utils/feed_functions.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/oauth/views.py b/apps/oauth/views.py index 9a35fa9fd..28eda2433 100644 --- a/apps/oauth/views.py +++ b/apps/oauth/views.py @@ -310,7 +310,10 @@ def api_folder_list(request, trigger_slug=None): user = request.user usf = UserSubscriptionFolders.objects.get(user=user) flat_folders = usf.flatten_folders() - titles = [dict(label="All Site Stories", value="all")] + if 'add-new-subscription' in request.path: + titles = [] + else: + titles = [dict(label="All Site Stories", value="all")] for folder_title in sorted(flat_folders.keys()): if folder_title and folder_title != " ": diff --git a/utils/feed_functions.py b/utils/feed_functions.py index a87e43f2e..bf2ad6648 100644 --- a/utils/feed_functions.py +++ b/utils/feed_functions.py @@ -190,7 +190,8 @@ def add_object_to_folder(obj, in_folder, folders, parent='', added=False): if isinstance(obj, dict): obj_identifier = obj.keys()[0] - if (not in_folder and not parent and + if ((not in_folder or in_folder == " ") and + not parent and not isinstance(obj, dict) and obj_identifier not in folders): folders.append(obj)