Migrations fixes revealed as necessary by the admin pages, which were also fixed.

src/objects/admin.py

@@ -46,6 +46,7 @@ class ObjectCreateForm(forms.ModelForm):
                                         required=False,
                                         widget=forms.TextInput(attrs={'size':'78'}),
                                         help_text="Most non-character objects don't need a cmdset and can leave this field blank.")
+    raw_id_fields = ('db_destination', 'db_location', 'db_home')
 
 
 
@@ -60,7 +61,7 @@ class ObjectEditForm(ObjectCreateForm):
 
 class ObjectDBAdmin(admin.ModelAdmin):
 
-    list_display = ('id', 'db_key', 'db_location', 'db_player', 'db_typeclass_path')
+    list_display = ('id', 'db_key', 'db_player', 'db_typeclass_path')
     list_display_links = ('id', 'db_key')
     ordering = ['db_player', 'db_typeclass_path', 'id']
     search_fields = ['^db_key', 'db_typeclass_path']
@@ -69,7 +70,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
     save_as = True
     save_on_top = True
     list_select_related = True
-    list_filter = ('db_permissions', 'db_location', 'db_typeclass_path')
+    list_filter = ('db_permissions', 'db_typeclass_path')
 
     # editing fields setup
 
@@ -91,7 +92,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
     add_fieldsets = (
         (None, {
                 'fields': (('db_key','db_typeclass_path'), 'db_permissions',
-                           ('db_location', 'db_home'), 'db_destination','db_cmdset_storage'
+                           ('db_location', 'db_home'), 'db_destination', 'db_cmdset_storage'
                            )}),
         )
     def get_fieldsets(self, request, obj=None):

src/players/admin.py

@@ -129,12 +129,9 @@ class PlayerInline(admin.StackedInline):
 class PlayerDBAdmin(BaseUserAdmin):
     "This is the main creation screen for Users/players"
 
-    list_display = ('username','email', 'is_staff', 'is_superuser')
+    list_display = ('username', 'email', 'is_staff', 'is_superuser')
     form = PlayerDBChangeForm
     add_form = PlayerDBCreationForm
-    inlines = [PlayerInline]
-    add_form_template = "admin/players/add_form.html"
-    change_form_template = "admin/players/change_form.html"
     fieldsets = (
         (None, {'fields': ('username', 'password', 'email')}),
         ('Website profile', {'fields': ('first_name', 'last_name'),

src/players/migrations/0027_permissions_and_groups.py

@@ -0,0 +1,93 @@
+# -*- coding: 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):
+        db.rename_table('players_playerdbtmp_groups', 'players_playerdb_groups')
+        db.rename_column('players_playerdb_groups', 'playerdbtmp_id', 'playerdb_id')
+        db.rename_table('players_playerdbtmp_user_permissions', 'players_playerdb_user_permissions')
+        db.rename_column('players_playerdb_user_permissions', 'playerdbtmp_id', 'playerdb_id')
+
+    def backwards(self, orm):
+        db.rename_table('players_playerdb_groups', 'players_playerdbtmp_groups')
+        db.rename_column('players_playerdbtmp_groups', 'playerdb_id', 'playerdbtmp_id')
+        db.rename_table('players_playerdb_user_permissions', 'players_playerdbtmp_user_permissions')
+        db.rename_column('players_playerdbtmp_user_permissions', 'playerdb_id', 'playerdbtmp_id')
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'players.playerdb': {
+            'Meta': {'object_name': 'PlayerDB'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}),
+            'db_cmdset_storage': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'db_is_connected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}),
+            'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}),
+            'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'typeclasses.attribute': {
+            'Meta': {'object_name': 'Attribute'},
+            'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        u'typeclasses.liteattribute': {
+            'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"},
+            'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'db_data': ('django.db.models.fields.TextField', [], {}),
+            'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        u'typeclasses.tag': {
+            'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"},
+            'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
+            'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['players']

src/typeclasses/migrations/0004_copy_nicks_to_liteattrs_aliases_to_tags.py

@@ -55,7 +55,7 @@ class Migration(DataMigration):
                 print "Nick already exists: %s for %s" % (nick.db_nick, nick.db_obj.db_key)
         # South expects the migration to be transaction managed. So start up a
         # new transaction for it to close immediately when it exits this function.
-        db.commit_transaction()
+        db.start_transaction()
 
 
     def backwards(self, orm):