From b16def5c09005274fb25456c563119d3b1e52fc4 Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Tue, 22 Nov 2011 22:27:20 -0600 Subject: [PATCH] Merged changes from sortable-by-refactor. Incremented version to 1.2. Refactored ORM calls to properly order objects by the sortable_by property to ensure objects are grouped correctly in the sortable change list template after being passed through dynamic_regroup. Fixed missing import for jquery.effects.core, again. Refactored sortable_by classmethod into a property. --- README | 0 adminsortable/__init__.py | 0 adminsortable/admin.py | 0 adminsortable/models.py | 0 .../templates/adminsortable/change_list.html | 0 .../adminsortable/shared/javascript_includes.html | 0 .../adminsortable/shared/nested_objects.html | 0 .../templatetags/django_template_additions.py | 0 sample_project/adminsortable.sqlite | Bin sample_project/app/admin.py | 0 sample_project/app/models.py | 0 sample_project/app/tests.py | 0 sample_project/settings.py | 0 13 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 README mode change 100644 => 100755 adminsortable/__init__.py mode change 100644 => 100755 adminsortable/admin.py mode change 100644 => 100755 adminsortable/models.py mode change 100644 => 100755 adminsortable/templates/adminsortable/change_list.html mode change 100644 => 100755 adminsortable/templates/adminsortable/shared/javascript_includes.html mode change 100644 => 100755 adminsortable/templates/adminsortable/shared/nested_objects.html mode change 100644 => 100755 adminsortable/templatetags/django_template_additions.py mode change 100644 => 100755 sample_project/adminsortable.sqlite mode change 100644 => 100755 sample_project/app/admin.py mode change 100644 => 100755 sample_project/app/models.py mode change 100644 => 100755 sample_project/app/tests.py mode change 100644 => 100755 sample_project/settings.py diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py old mode 100644 new mode 100755 diff --git a/adminsortable/admin.py b/adminsortable/admin.py old mode 100644 new mode 100755 diff --git a/adminsortable/models.py b/adminsortable/models.py old mode 100644 new mode 100755 diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html old mode 100644 new mode 100755 diff --git a/adminsortable/templates/adminsortable/shared/javascript_includes.html b/adminsortable/templates/adminsortable/shared/javascript_includes.html old mode 100644 new mode 100755 diff --git a/adminsortable/templates/adminsortable/shared/nested_objects.html b/adminsortable/templates/adminsortable/shared/nested_objects.html old mode 100644 new mode 100755 diff --git a/adminsortable/templatetags/django_template_additions.py b/adminsortable/templatetags/django_template_additions.py old mode 100644 new mode 100755 diff --git a/sample_project/adminsortable.sqlite b/sample_project/adminsortable.sqlite old mode 100644 new mode 100755 diff --git a/sample_project/app/admin.py b/sample_project/app/admin.py old mode 100644 new mode 100755 diff --git a/sample_project/app/models.py b/sample_project/app/models.py old mode 100644 new mode 100755 diff --git a/sample_project/app/tests.py b/sample_project/app/tests.py old mode 100644 new mode 100755 diff --git a/sample_project/settings.py b/sample_project/settings.py old mode 100644 new mode 100755