From 5829b50148e01cd90797e03264bdc5845f3bc9fa Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Fri, 12 Apr 2013 16:44:03 -0700 Subject: [PATCH] Sort multi and subreddit names alphabetically. --- r2/r2/lib/pages/pages.py | 4 +++- r2/r2/public/static/js/multi.js | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 352054ae9..f567fe223 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -1591,6 +1591,7 @@ class TrophyCase(Templated): class SidebarMultiList(Templated): def __init__(self, multis): Templated.__init__(self) + multis.sort(key=lambda multi: multi.name.lower()) self.multis = multis @@ -1826,6 +1827,7 @@ class MultiInfoBar(Templated): Templated.__init__(self) self.multi = wrap_things(multi)[0] self.can_edit = multi.can_edit(user) + srs.sort(key=lambda sr: sr.name.lower()) self.srs = srs @@ -4102,7 +4104,7 @@ class ListingChooser(Templated): if c.user_is_loggedin: multis = LabeledMulti.by_owner(c.user) - multis.sort(key=lambda multi: multi.name) + multis.sort(key=lambda multi: multi.name.lower()) for multi in multis: self.add_item("multi", multi.name, multi.path) self.selected_item = self.find_selected() diff --git a/r2/r2/public/static/js/multi.js b/r2/r2/public/static/js/multi.js index 52de25561..e7bf750a4 100644 --- a/r2/r2/public/static/js/multi.js +++ b/r2/r2/public/static/js/multi.js @@ -31,7 +31,10 @@ r.multi = { r.multi.MultiRedditList = Backbone.Collection.extend({ model: Backbone.Model.extend({ idAttribute: 'name' - }) + }), + comparator: function(model) { + return model.get('name').toLowerCase() + } }) r.multi.MultiReddit = Backbone.Model.extend({ @@ -67,6 +70,9 @@ r.multi.MultiReddit = Backbone.Model.extend({ r.multi.MyMultiCollection = Backbone.Collection.extend({ url: '/api/multi/mine', model: r.multi.MultiReddit, + comparator: function(model) { + return model.get('path').toLowerCase() + }, create: function(attributes, options) { if ('name' in attributes) {