Merge branch 'sortable-by-refactor'

sample_project/app/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from adminsortable.admin import SortableAdmin, SortableTabularInline, SortableStackedInline
-from app.models import Category, Project, Credit, Note
+from app.models import Category, Project, Credit, Note, Sample
 
 
 admin.site.register(Category, SortableAdmin)
@@ -20,3 +20,4 @@ class ProjectAdmin(SortableAdmin):
     list_display = ['__unicode__', 'category']
 
 admin.site.register(Project, ProjectAdmin)
+admin.site.register(Sample, SortableAdmin)

sample_project/app/migrations/0003_add_sample.py

@@ -0,0 +1,68 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'Sample'
+        db.create_table('app_sample', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('category', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['app.Category'])),
+            ('description', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal('app', ['Sample'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Sample'
+        db.delete_table('app_sample')
+
+
+    models = {
+        'app.category': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Category'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'app.credit': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Credit'},
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['app.Project']"})
+        },
+        'app.note': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Note'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['app.Project']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'app.project': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Project'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['app.Category']"}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'app.sample': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Sample'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['app.Category']"}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['app']

sample_project/app/models.py

@@ -29,6 +29,8 @@ class Project(SimpleModel, Sortable):
     class Meta(Sortable.Meta):
         pass
 
+    #deprecated: shown for backward compatibility only. Reference class "Sample" for proper
+    # designation of `sortable_by` as a property
     @classmethod
     def sortable_by(cls):
         return Category, 'category'
@@ -37,6 +39,19 @@ class Project(SimpleModel, Sortable):
     description = models.TextField()
 
 
+#a model that is sortable relative to a foreign key that is also sortable
+class Sample(SimpleModel, Sortable):
+    class Meta(Sortable.Meta):
+        ordering = Sortable.Meta.ordering + ['category']
+
+    category = models.ForeignKey(Category)
+    description = models.TextField()
+
+    #field to define which foreign key the model is sortable by.
+    #works with versions > 1.1.1
+    sortable_by = Category
+
+
 #registered as a tabular inline on project
 class Credit(Sortable):
     class Meta(Sortable.Meta):

sample_project/app/tests.py

@@ -1,12 +1,9 @@
 import httplib
 import json
 
-from django.contrib.auth.forms import authenticate, UserCreationForm
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from django.middleware import csrf
 from django.db import models
-from django.template.defaultfilters import urlencode
 from django.test import TestCase
 from django.test.client import Client, RequestFactory
 

sample_project/settings.py

@@ -102,7 +102,6 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (