From: Stephen Burrows Date: Tue, 26 Apr 2011 15:49:57 +0000 (-0400) Subject: Merge branch 'master' of git://github.com/lapilofu/philo X-Git-Tag: philo-0.9~14^2 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/66d42c282c25daff0aa34ae374a05439ce2868c6?hp=f325ff6e5a40a972e6732c09b87e077adf2c2e35 Merge branch 'master' of git://github.com/lapilofu/philo --- diff --git a/admin/collections.py b/admin/collections.py index dfc4826..d422b74 100644 --- a/admin/collections.py +++ b/admin/collections.py @@ -10,6 +10,7 @@ class CollectionMemberInline(admin.TabularInline): classes = COLLAPSE_CLASSES allow_add = True fields = ('member_content_type', 'member_object_id', 'index') + sortable_field_name = 'index' class CollectionAdmin(admin.ModelAdmin): diff --git a/contrib/sobol/models.py b/contrib/sobol/models.py index e4e4202..ee8187d 100644 --- a/contrib/sobol/models.py +++ b/contrib/sobol/models.py @@ -198,7 +198,7 @@ class SearchView(MultiView): }) else: context.update({ - 'searches': [{'verbose_name': verbose_name, 'url': self.reverse('ajax_api_view', kwargs={'slug': slug}, node=request.node)} for slug, verbose_name in registry.iterchoices() if slug in self.searches] + 'searches': [{'verbose_name': verbose_name, 'slug': slug, 'url': self.reverse('ajax_api_view', kwargs={'slug': slug}, node=request.node), 'result_template': registry[slug].result_template} for slug, verbose_name in registry.iterchoices() if slug in self.searches] }) else: form = SearchForm()