Merge pull request #748 from gwu-libraries/t746-order-collections

Fixes #746 - Order of collections
gwu-libraries · Mar 13, 2017 · 6bcf9f5 · 6bcf9f5
2 parents f8892be + 19f9d92
commit 6bcf9f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sfm/ui/models.py b/sfm/ui/models.py
@@ -303,13 +303,13 @@ class Collection(models.Model):
         (60 * 24 * 7 * 4, 'Every 4 weeks')
     ]
     HARVEST_CHOICES = [
+        (TWITTER_USER_TIMELINE, 'Twitter user timeline'),
         (TWITTER_SEARCH, 'Twitter search'),
         (TWITTER_FILTER, 'Twitter filter'),
-        (TWITTER_USER_TIMELINE, 'Twitter user timeline'),
         (TWITTER_SAMPLE, 'Twitter sample'),
+        (TUMBLR_BLOG_POSTS, 'Tumblr blog posts'),
         (FLICKR_USER, 'Flickr user'),
-        (WEIBO_TIMELINE, 'Weibo timeline'),
-        (TUMBLR_BLOG_POSTS, 'Tumblr blog posts')
+        (WEIBO_TIMELINE, 'Weibo timeline')
     ]
     HARVEST_DESCRIPTION = {
         TWITTER_SEARCH: 'Recent tweets matching a query',

diff --git a/sfm/ui/views.py b/sfm/ui/views.py
@@ -62,7 +62,7 @@ def get_context_data(self, **kwargs):
         context['collection_list'] = Collection.objects.filter(
             collection_set=self.object.pk).annotate(num_seeds=Count('seeds')).order_by('name')
         context["diffs"] = diff_object_history(self.object)
-        context["harvest_types"] = sorted(Collection.HARVEST_CHOICES)
+        context["harvest_types"] = Collection.HARVEST_CHOICES
         context["harvest_description"] = Collection.HARVEST_DESCRIPTION
         context["item_id"] = self.object.id
         context["model_name"] = "collection_set"