From 5c91edd4a5fdad12d0f34e5e01f092f5c48df3ec Mon Sep 17 00:00:00 2001 From: Kevin Chugh Date: Tue, 30 Jul 2013 01:43:49 -0400 Subject: [PATCH] update coffeescript to use new status url --- common/static/coffee/src/discussion/utils.coffee | 2 +- .../src/discussion/views/discussion_thread_list_view.coffee | 3 +-- lms/djangoapps/notification_prefs/views.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/coffee/src/discussion/utils.coffee index 50d65c70dd..14273bb2e4 100644 --- a/common/static/coffee/src/discussion/utils.coffee +++ b/common/static/coffee/src/discussion/utils.coffee @@ -84,7 +84,7 @@ class @DiscussionUtil threads : "/courses/#{$$course_id}/discussion/forum" "enable_notifications" : "/notification_prefs/enable/" "disable_notifications" : "/notification_prefs/disable/" - "notifications_status" : "/user_api/v1/user_prefs/?key=notification_pref&use=#{param}" + "notifications_status" : "notification_prefs/status/user_prefs/?key=notification_pref&use=#{param}" }[name] @safeAjax: (params) -> diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index d4c4fdab07..f9710c7077 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -202,9 +202,8 @@ if Backbone? DiscussionUtil.safeAjax url: url type: "GET" - dataType: 'json' success: (response, textStatus) => - if response.count==1 + if response.status $('input.email-setting').attr('checked','checked') else $('input.email-setting').removeAttr('checked') diff --git a/lms/djangoapps/notification_prefs/views.py b/lms/djangoapps/notification_prefs/views.py index bacb98bc7d..c393288323 100644 --- a/lms/djangoapps/notification_prefs/views.py +++ b/lms/djangoapps/notification_prefs/views.py @@ -142,7 +142,7 @@ def ajax_status(request): if not request.user.is_authenticated(): raise PermissionDenied - prefs UserPreference.objects.get( + prefs = UserPreference.objects.get( user=request.user, key=NOTIFICATION_PREF_KEY, defaults={