Commit 748d7660 by Greg Price

Remove "flagged discussions" from forum topic menu

This feature is supplanted by the flagged option in the filter menu,
which can work within topics as well as across all topics.
parent 80d1cae6
...@@ -97,9 +97,6 @@ describe "DiscussionThreadListView", -> ...@@ -97,9 +97,6 @@ describe "DiscussionThreadListView", ->
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-all"> <li class="forum-nav-browse-menu-item forum-nav-browse-menu-all">
<a href="#" class="forum-nav-browse-title">All Discussions</a> <a href="#" class="forum-nav-browse-title">All Discussions</a>
</li> </li>
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-flagged">
<a href="#" class="forum-nav-browse-title"><i class="icon icon-flag"></i>Flagged Discussions</a>
</li>
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-following"> <li class="forum-nav-browse-menu-item forum-nav-browse-menu-following">
<a href="#" class="forum-nav-browse-title"><i class="icon icon-star"></i>Posts I'm Following</a> <a href="#" class="forum-nav-browse-title"><i class="icon icon-star"></i>Posts I'm Following</a>
</li> </li>
...@@ -528,7 +525,7 @@ describe "DiscussionThreadListView", -> ...@@ -528,7 +525,7 @@ describe "DiscussionThreadListView", ->
expect(visibleItems).toEqual(expectedItems) expect(visibleItems).toEqual(expectedItems)
it "should be case-insensitive", -> it "should be case-insensitive", ->
checkFilter("flagged", ["Flagged Discussions"]) checkFilter("other", ["Other Category"])
it "should match partial words", -> it "should match partial words", ->
checkFilter("ateg", ["Other Category"]) checkFilter("ateg", ["Other Category"])
......
...@@ -45,9 +45,6 @@ if Backbone? ...@@ -45,9 +45,6 @@ if Backbone?
data['commentable_ids'] = options.commentable_ids data['commentable_ids'] = options.commentable_ids
when 'all' when 'all'
url = DiscussionUtil.urlFor 'threads' url = DiscussionUtil.urlFor 'threads'
when 'flagged'
data['flagged'] = true
url = DiscussionUtil.urlFor 'search'
when 'followed' when 'followed'
url = DiscussionUtil.urlFor 'followed_threads', options.user_id url = DiscussionUtil.urlFor 'followed_threads', options.user_id
if options['group_id'] if options['group_id']
......
...@@ -364,10 +364,6 @@ if Backbone? ...@@ -364,10 +364,6 @@ if Backbone?
@discussionIds = "" @discussionIds = ""
@$('.forum-nav-filter-cohort').show() @$('.forum-nav-filter-cohort').show()
@retrieveAllThreads() @retrieveAllThreads()
else if item.hasClass("forum-nav-browse-menu-flagged")
@discussionIds = ""
@$('.forum-nav-filter-cohort').hide()
@retrieveFlaggedThreads()
else if item.hasClass("forum-nav-browse-menu-following") else if item.hasClass("forum-nav-browse-menu-following")
@retrieveFollowed() @retrieveFollowed()
@$('.forum-nav-filter-cohort').hide() @$('.forum-nav-filter-cohort').hide()
...@@ -416,12 +412,6 @@ if Backbone? ...@@ -416,12 +412,6 @@ if Backbone?
@collection.reset() @collection.reset()
@loadMorePages(event) @loadMorePages(event)
retrieveFlaggedThreads: (event)->
@collection.current_page = 0
@collection.reset()
@mode = 'flagged'
@loadMorePages(event)
sortThreads: (event) -> sortThreads: (event) ->
@displayedCollection.setSortComparator(@$(".forum-nav-sort-control").val()) @displayedCollection.setSortComparator(@$(".forum-nav-sort-control").val())
......
...@@ -42,11 +42,6 @@ ...@@ -42,11 +42,6 @@
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-all"> <li class="forum-nav-browse-menu-item forum-nav-browse-menu-all">
<a href="#" class="forum-nav-browse-title">${_("All Discussions")}</a> <a href="#" class="forum-nav-browse-title">${_("All Discussions")}</a>
</li> </li>
%if flag_moderator:
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-flagged">
<a href="#" class="forum-nav-browse-title"><i class="icon icon-flag"></i>${_("Flagged Discussions")}</a>
</li>
%endif
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-following"> <li class="forum-nav-browse-menu-item forum-nav-browse-menu-following">
<a href="#" class="forum-nav-browse-title"><i class="icon icon-star"></i>${_("Posts I'm Following")}</a> <a href="#" class="forum-nav-browse-title"><i class="icon icon-star"></i>${_("Posts I'm Following")}</a>
</li> </li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment