From 3970105ce523424ea1fdba151cb3f148d415c501 Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Wed, 5 Feb 2014 11:06:15 -0500 Subject: [PATCH] Removed un-needed properties on script tags for JS imports. Refactored sorting filters from class method into a model property with a default of an empty dictionary. Refactored sortable admin class to not make two calls to determine sortability and also to get objects for sorting. Added sorting_filters to sortable admin queryset. --- adminsortable/admin.py | 24 ++++++------------ adminsortable/models.py | 5 +--- .../templates/adminsortable/change_list.html | 10 ++++---- adminsortable/utils.py | 5 ++-- sample_project/app/admin.py | 6 ++++- sample_project/app/models.py | 6 ++--- sample_project/database/test_project.sqlite | Bin 75776 -> 75776 bytes sample_project/requirements.txt | 2 +- sample_project/sample_project/settings.py | 5 +--- .../admin/change_list_with_sort_link.html | 9 +++++++ 10 files changed, 35 insertions(+), 37 deletions(-) create mode 100644 sample_project/templates/app/person/admin/change_list_with_sort_link.html diff --git a/adminsortable/admin.py b/adminsortable/admin.py index 4ad25cb..fb27575 100644 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -28,6 +28,8 @@ STATIC_URL = settings.STATIC_URL class SortableAdminBase(object): + filtered_objects = [] + def changelist_view(self, request, extra_context=None): """ If the model that inherits Sortable has more than one object, @@ -35,12 +37,11 @@ class SortableAdminBase(object): object_tools block to take people to the view to change the sorting. """ - if self.model.ordering_subset() is not None: - objects = self.model.ordering_subset() - else: - objects = self.queryset(request) + # Apply any additional filters to create a subset of sortable objects + self.filtered_objects = self.queryset(request).filter( + **self.model.sorting_filters) - if get_is_sortable(objects): + if get_is_sortable(self.filtered_objects): self.change_list_template = \ self.sortable_change_list_with_sort_link_template self.is_sortable = True @@ -66,8 +67,6 @@ class SortableAdmin(SortableAdminBase, ModelAdmin): 'adminsortable/change_list_with_sort_link.html' sortable_change_form_template = 'adminsortable/change_form.html' sortable_change_list_template = 'adminsortable/change_list.html' - sortable_javascript_includes_template = \ - 'adminsortable/shared/javascript_includes.html' change_form_template_extends = 'admin/change_form.html' change_list_template_extends = 'admin/change_list.html' @@ -107,10 +106,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin): has_perm = request.user.has_perm('{}.{}'.format(opts.app_label, opts.get_change_permission())) - if self.model.ordering_subset() is not None: - objects = self.model.ordering_subset() - else: - objects = self.queryset(request) + objects = self.filtered_objects # Determine if we need to regroup objects relative to a # foreign key specified on the model class that is extending Sortable. @@ -169,9 +165,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin): 'group_expression': sortable_by_expression, 'sortable_by_class': sortable_by_class, 'sortable_by_class_is_sortable': sortable_by_class_is_sortable, - 'sortable_by_class_display_name': sortable_by_class_display_name, - 'sortable_javascript_includes_template': - self.sortable_javascript_includes_template + 'sortable_by_class_display_name': sortable_by_class_display_name } return render(request, self.sortable_change_list_template, context) @@ -208,8 +202,6 @@ class SortableAdmin(SortableAdminBase, ModelAdmin): self.change_form_template = self.sortable_change_form_template extra_context.update({ - 'sortable_javascript_includes_template': - self.sortable_javascript_includes_template, 'has_sortable_tabular_inlines': self.has_sortable_tabular_inlines, 'has_sortable_stacked_inlines': diff --git a/adminsortable/models.py b/adminsortable/models.py index 52cad36..d3dfef4 100644 --- a/adminsortable/models.py +++ b/adminsortable/models.py @@ -31,6 +31,7 @@ class Sortable(models.Model): order = models.PositiveIntegerField(editable=False, default=1, db_index=True) is_sortable = False + sorting_filters = {} # legacy support sortable_by = None @@ -43,10 +44,6 @@ class Sortable(models.Model): def model_type_id(cls): return ContentType.objects.get_for_model(cls).id - @classmethod - def ordering_subset(cls): - return None - def __init__(self, *args, **kwargs): super(Sortable, self).__init__(*args, **kwargs) diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html index bdc9522..af06213 100644 --- a/adminsortable/templates/adminsortable/change_list.html +++ b/adminsortable/templates/adminsortable/change_list.html @@ -9,11 +9,11 @@ {% block extrahead %} {{ block.super }} - - - - - + + + + + {% endblock %} {% block title %}{% blocktrans with opts.verbose_name_plural|capfirst as model %}Drag and drop {{ model }} to change display order{% endblocktrans %} | {% trans 'Django site admin' %}{% endblock %} diff --git a/adminsortable/utils.py b/adminsortable/utils.py index b38c42a..e2948cf 100644 --- a/adminsortable/utils.py +++ b/adminsortable/utils.py @@ -1,4 +1,5 @@ def get_is_sortable(objects): - if objects.count() > 1: - return True + if objects: + if objects.count() > 1: + return True return False diff --git a/sample_project/app/admin.py b/sample_project/app/admin.py index b0079e4..a00e3eb 100644 --- a/sample_project/app/admin.py +++ b/sample_project/app/admin.py @@ -60,4 +60,8 @@ class ProjectAdmin(SortableAdmin): admin.site.register(Project, ProjectAdmin) -admin.site.register(Person, SortableAdmin) +class PersonAdmin(SortableAdmin): + sortable_change_list_with_sort_link_template = 'app/person/admin/change_list_with_sort_link.html' + + +admin.site.register(Person, PersonAdmin) diff --git a/sample_project/app/models.py b/sample_project/app/models.py index 26c1b48..41b9417 100644 --- a/sample_project/app/models.py +++ b/sample_project/app/models.py @@ -105,9 +105,7 @@ class Person(Sortable): last_name = models.CharField(max_length=50) is_board_member = models.BooleanField(default=False) + sorting_filters = {'is_board_member': True} + def __unicode__(self): return '{} {}'.format(self.first_name, self.last_name) - - @classmethod - def ordering_subset(cls): - return cls.objects.filter(is_board_member=True) diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite index 2cd709f2135a407be7eebb8074a8b071296eb47a..486daf5dd089246f48b464d7e6ac6be8014a1e41 100644 GIT binary patch delta 886 zcmah{O-vI}5PolGx9u)1KLSQYNgHg42VlGHQXzp@`K_^QRIs#(iBNv}w@`tm(5QfC z609}$NIXblJk=#)!od(UF@Xd)2od#SJQWWZQx1?A_f<*Y&-WkQhXgb1Ad(C1s`!>IGm4 z!xrqol2Sy^LL+P<5_L?9fkBw9q;7W0k#L_;8XE00TG0v2AeOB>>a-|3vnO>0YA_8M z1X;+yF6^s`x1d;$5Ca%fKm%q~#bR37f2q@P-;oA3C^&!(ML+)@Qke?O)vzo9Yjps7 zh{*-&w8W#)5N3>;pT)qz4>fih!LGu+`35Yhn|n~Qi+b7sS+%9WJXWv!Ixoe;vPbaxz0Ho8BwX=JZLJ}X+!DX$?i_bD zN9@kjeGZ?RXmZv%rMGP$>XBQ6-NLP?x7`)(aMy*r z?y)A1TN?Jd#gH=)3v>wt=kM?BlES`lUBs*Ab9M0z0&lTZ@j{iQ&S*Klp%dkdYs%p8 v)pifsd+ZC(itsrOL+WiAF2&Ts$1;48R(B?&e%ChSC$*5Rzmns delta 707 zcmaiyPe@cj9LMK3-+8~kMNoUn4qLDVYee(j8rG?S`OPr%`+ep!%uM9PL|)vf zqx|H)4$9AUpR=nHZ859ON;IWxt2HTK+g42@-DbOJka3g$qB)#InxEho@Pr0wlUDdV zUqe0K@(j<&kZ7mIgXpBb^8=~TaeKtRG}_WLWL+H?O!r;yO|-;&$Hvn!J89xBi#Q>1 zK+bgzTh*0AlT9%zVW$$NY`(D`#sVJ7;Jy10$gzNvor;7QV{YGW^4(NKRAGeyvkbG? zzzgLtgQI&$W286mGd<~%i~Z*5;jw-*wi_DL^@hLK;))gC=55X7#!PLX8YL!BAQVwh z;IaZQqgDeEhjJoa1)YQ{(U>eh3IvQz=EExCJ3h(a{1RFjLxE{-g|55NAMmP$8v}kf z`h4mLo!~(Xd{uyThA+~1`Vsn{9U)5#K~bf0fFeUl3Ar-w;TpOC(z%x_%Zq-Yt2{rV z3=gF7Qou3AekYo{=IqRw&Qh-3_^Ec68GhiK48B^#WS4ftbKCN9=fZQ=JkQEiJw8`t z@i^~07Mx}_xeur>M19)HncYpwOXRFRx|eR l2go`hI&2W1dR9kaLiSA^r35~sC_~Rbz*iB=mg;GT_zjjYqniK# diff --git a/sample_project/requirements.txt b/sample_project/requirements.txt index 8e1d2ba..61f1db1 100644 --- a/sample_project/requirements.txt +++ b/sample_project/requirements.txt @@ -1,2 +1,2 @@ -django==1.5.2 +django==1.6.1 south==0.8.1 diff --git a/sample_project/sample_project/settings.py b/sample_project/sample_project/settings.py index 3c2b32e..9280511 100755 --- a/sample_project/sample_project/settings.py +++ b/sample_project/sample_project/settings.py @@ -109,10 +109,7 @@ ROOT_URLCONF = 'sample_project.urls' WSGI_APPLICATION = 'sample_project.wsgi.application' TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or - # "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. + map_path('templates'), ) INSTALLED_APPS = ( diff --git a/sample_project/templates/app/person/admin/change_list_with_sort_link.html b/sample_project/templates/app/person/admin/change_list_with_sort_link.html new file mode 100644 index 0000000..d406c80 --- /dev/null +++ b/sample_project/templates/app/person/admin/change_list_with_sort_link.html @@ -0,0 +1,9 @@ +{% extends change_list_template_extends %} +{% load i18n %} + +{% block object-tools-items %} +
  • + {% trans 'Change Order of Board Members' %} +
    • + {{ block.super }} +{% endblock %}