Fixed User/Player creation in Admin, much more intuitive now. Remains issues with creating attributes since these need to be pickled to/from the database in order to be properly handled.

src/objects/admin.py

@@ -6,52 +6,55 @@
 from django import forms
 from django.conf import settings
 from django.contrib import admin
-from src.objects.models import ObjAttribute, ObjectDB
+from src.objects.models import ObjAttribute, ObjectDB, ObjectNick, Alias
 from src.utils.utils import mod_import
 
-# class ObjectAttributeAdmin(admin.ModelAdmin):
-#     list_display = ('id', 'db_key', 'db_obj')
-#     list_display_links = ('id', 'db_key')
-#     ordering = ('db_obj','db_key', 'id')
-#     search_fields = ('^db_key', 'db_obj')
-#     save_as = True
-#     save_on_top = True
-#     list_select_related = True 
-# admin.site.register(ObjAttribute, ObjectAttributeAdmin)
 
 class ObjAttributeInline(admin.TabularInline):
     model = ObjAttribute
     fields = ('db_key', 'db_value')
     extra = 0
 
-class ObjectEditForm(forms.ModelForm):
-    "This form details the look of the fields"
-    class Meta:
-        model = ObjectDB
-    db_typeclass_path = forms.CharField(label="Typeclass",
-                                        initial=settings.BASE_OBJECT_TYPECLASS,
-                                        widget=forms.TextInput(attrs={'size':'78'}),
-                                        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.")
-    db_permissions = forms.CharField(label="Permissions", 
-                                     required=False,
-                                     widget=forms.TextInput(attrs={'size':'78'}),
-                                     help_text="a comma-separated list of text strings checked by certain locks. They are mainly of use for Character objects. Character permissions overload permissions defined on a controlling Player. Most objects normally don't have any permissions defined.")
-    db_lock_storage = forms.CharField(label="Locks", 
-                                      required=False, 
-                                      widget=forms.Textarea(attrs={'cols':'100', 'rows':'2'}),
-                                      help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Take a look at other Objects to see valid strings. An empty lock means no access is given to anything for anyone. ")
+class NickInline(admin.TabularInline):
+    model = ObjectNick
+    fields = ('db_nick', 'db_real', 'db_type')
+    extra = 0
+
+class AliasInline(admin.TabularInline):
+    model = Alias
+    fields = ("db_key",)
+    extra = 0
 
 class ObjectCreateForm(forms.ModelForm):
     "This form details the look of the fields"
     class Meta:
         model = ObjectDB
-        fields = ('db_key',)
-    db_typeclass_path = forms.CharField(label="Typeclass",initial=settings.BASE_OBJECT_TYPECLASS,
+    db_key = forms.CharField(label="Name/Key",
+                             widget=forms.TextInput(attrs={'size':'78'}),
+                             help_text="Main identifier, like 'apple', 'strong guy', 'Elizabeth' etc. If creating a Character, check so the name is unique among characters!",)
+    db_typeclass_path = forms.CharField(label="Typeclass",initial="Change to (for example) %s or %s." % (settings.BASE_OBJECT_TYPECLASS, settings.BASE_CHARACTER_TYPECLASS),
                                         widget=forms.TextInput(attrs={'size':'78'}),
-                                        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.")
-    db_permissions = forms.CharField(label="Permissions", initial=settings.PERMISSION_PLAYER_DEFAULT, required=False,
+                                        help_text="This defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass. If you are creating a Character you should use the typeclass defined by settings.BASE_CHARACTER_TYPECLASS or one derived from that.")
+    db_permissions = forms.CharField(label="Permissions", 
+                                     initial=settings.PERMISSION_PLAYER_DEFAULT, 
+                                     required=False,
                                      widget=forms.TextInput(attrs={'size':'78'}),
                                      help_text="a comma-separated list of text strings checked by certain locks. They are mainly of use for Character objects. Character permissions overload permissions defined on a controlling Player. Most objects normally don't have any permissions defined.")
+    db_cmdset_storage = forms.CharField(label="CmdSet", 
+                                        initial=settings.CMDSET_DEFAULT,
+                                        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.")
+    
+    
+
+class ObjectEditForm(ObjectCreateForm):
+    "Form used for editing. Extends the create one with more fields"
+
+    db_lock_storage = forms.CharField(label="Locks", 
+                                      required=False, 
+                                      widget=forms.Textarea(attrs={'cols':'100', 'rows':'2'}),
+                                      help_text="In-game lock definition string. If not given, defaults will be used. This string should be on the form <i>type:lockfunction(args);type2:lockfunction2(args);...")
 
     
 class ObjectDBAdmin(admin.ModelAdmin):    
@@ -77,7 +80,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
         )
 
     #deactivated temporarily, they cause empty objects to be created in admin
-    inlines = [ObjAttributeInline]
+    inlines = [AliasInline, ObjAttributeInline]
 
 
     # Custom modification to give two different forms wether adding or not.