diff --git a/lms/djangoapps/django_comment_client/forum/urls.py b/lms/djangoapps/django_comment_client/forum/urls.py index 696e981328..526ae3e582 100644 --- a/lms/djangoapps/django_comment_client/forum/urls.py +++ b/lms/djangoapps/django_comment_client/forum/urls.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import url, patterns import django_comment_client.forum.views urlpatterns = patterns('django_comment_client.forum.views', - url(r'users/(?P\w+)/following$', 'following_threads', name='following_threads'), + url(r'users/(?P\w+)/followed$', 'followed_threads', name='followed_threads'), url(r'users/(?P\w+)$', 'user_profile', name='user_profile'), url(r'(?P[\w\-]+)/threads/(?P\w+)$', 'single_thread', name='single_thread'), url(r'(?P[\w\-]+)/inline$', 'inline_discussion', name='inline_discussion'), diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py index 48bf97b8c7..21c58ad398 100644 --- a/lms/djangoapps/django_comment_client/forum/views.py +++ b/lms/djangoapps/django_comment_client/forum/views.py @@ -279,7 +279,7 @@ def user_profile(request, course_id, user_id): raise Http404 -def following_threads(request, course_id, user_id): +def followed_threads(request, course_id, user_id): course = get_course_with_access(request.user, course_id, 'load') try: profiled_user = cc.User(id=user_id, course_id=course_id) diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee index fd3cd6a0b6..2b4339015f 100644 --- a/lms/static/coffee/src/discussion/discussion.coffee +++ b/lms/static/coffee/src/discussion/discussion.coffee @@ -26,7 +26,6 @@ if Backbone? model retrieveAnotherPage: (mode, options={}, sort_options={})-> - # TODO: I really feel that this belongs in DiscussionThreadListView @current_page += 1 data = { page: @current_page } switch mode @@ -37,8 +36,8 @@ if Backbone? data['commentable_ids'] = options.commentable_ids when 'all' url = DiscussionUtil.urlFor 'threads' - when 'following' - url = DiscussionUtil.urlFor 'following_threads', options.user_id + when 'followed' + url = DiscussionUtil.urlFor 'followed_threads', options.user_id data['sort_key'] = sort_options.sort_key || 'date' data['sort_order'] = sort_options.sort_order || 'desc' DiscussionUtil.safeAjax diff --git a/lms/static/coffee/src/discussion/utils.coffee b/lms/static/coffee/src/discussion/utils.coffee index e1e5649edc..769aaa0bb1 100644 --- a/lms/static/coffee/src/discussion/utils.coffee +++ b/lms/static/coffee/src/discussion/utils.coffee @@ -66,7 +66,7 @@ class @DiscussionUtil permanent_link_thread : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}" permanent_link_comment : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}##{param2}" user_profile : "/courses/#{$$course_id}/discussion/forum/users/#{param}" - following_threads : "/courses/#{$$course_id}/discussion/forum/users/#{param}/following" + followed_threads : "/courses/#{$$course_id}/discussion/forum/users/#{param}/followed" threads : "/courses/#{$$course_id}/discussion/forum" }[name] diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 03ed3a595c..7a6bac1d91 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -128,7 +128,7 @@ if Backbone? when 'search' options.search_text = @current_search options.commentable_ids = @discussionIds - when 'following' + when 'followed' options.user_id = window.user.id @collection.retrieveAnotherPage(@mode, options, {sort_key: @sortBy}) @@ -257,7 +257,7 @@ if Backbone? @$(".post-search-field").val("") @retrieveAllThreads() else if discussionId == "#following" - @retrieveFollowing(event) + @retrieveFollowed(event) # Retrieve following else discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id @@ -388,8 +388,8 @@ if Backbone? scrollTarget = Math.max(scrollTop - itemFromTop - $(".browse-topic-drop-menu").height() + $(items[index]).height(), scrollTarget) $(".browse-topic-drop-menu").scrollTop(scrollTarget) - retrieveFollowing: (event)=> - @mode = 'following' + retrieveFollowed: (event)=> + @mode = 'followed' @collection.reset() @collection.current_page = 0 @loadMorePages(event)