Changes between Version 15 and Version 16 of DynamicModels

Timestamp:

Jul 22, 2008, 4:51:16 AM (16 years ago)

Author:

Alexander Solovyov

Comment:

update for nfa

DynamicModels

@@ -1 @@
-
 = Dynamic models =
 
@@ -52 +51 @@
 {{{
 #!python
-def create_model(name, fields=None, app_label='', module='', options=None, admin=None):
-    "One example of how to create a model dynamically at run-time"
-
+def create_model(name, fields=None, app_label='', module='', options=None, admin_opts=None):
+    """
+    Create specified model
+    """
     class Meta:
         # Using type('Meta', ...) gives a dictproxy error during model creation
@@ -65 +65 @@
     # Update Meta with any options that were provided
     if options is not None:
-        for key, value in options.items():
+        for key, value in options.iteritems():
             setattr(Meta, key, value)
 
@@ -75 +75 @@
         attrs.update(fields)
 
-    # Create an Admin inner class if admin options were provided
-    if admin is not None:
-        class Admin:
+    # Create the class, which automatically triggers ModelBase processing
+    model = type(name, (models.Model,), attrs)
+
+    # Create an Admin class if admin options were provided
+    if admin_opts is not None:
+        class Admin(admin.ModelAdmin):
             pass
-        for key, value in admin:
+        for key, value in admin_opts:
             setattr(Admin, key, value)
-        attrs['Admin'] = Admin
-
-    # Create the class, which automatically triggers ModelBase processing
-    return type(name, (models.Model,), attrs)
+        admin.site.register(model, Admin)
+
+    return model
 }}}
 
@@ -94 +96 @@
  * {{{module}}} - An arbitrary module name to use as the model's source (prior to [5163], this had to be a real module path that had in fact been loaded)
  * {{{options}}} - A dictionary of options, as if they were provided to the inner {{{Meta}}} class
- * {{{admin}}} - A dictionary of admin options, as if they were provided to the inner {{{Admin}}} class (again, see [#Admininterface Admin drawback] below)
+ * {{{admin_opts}}} - A dictionary of admin options, as if they were provided to the {{{Admin}}} class (again, see [#Admininterface Admin drawback] below)
 
 A note about {{{app_label}}} and {{{module}}}: Django always needs an {{{app_label}}} for its own use. If it's not explicitly supplied, it will be pulled from part of the model's {{{__module__}}} attribute, so ''at least one of the two must always be provided''. Otherwise, you'll get a {{{KeyError: ''}}} error when you try to create the model. Supplying {{{app_label}}} will always work just fine, regardless of whether {{{module}}} is provided. But if you supply ''only'' {{{module}}}, you'll have to make sure that it lines up with an entry in {{{INSTALLED_APPS}}}, so that Django can determine {{{app_label}}} correctly.
@@ -122 +124 @@
 ...     'verbose_name': 'valued customer',
 ... }
->>> admin = {} # An empty dictionary is equivalent to "class Admin: pass"
+>>> admin_opts = {} # An empty dictionary is equivalent to "class Admin: pass"
 >>> model = create_model('Person', fields,
 ...     options=options,
-...     admin=admin,
+...     admin_opts=admin_opts,
 ...     app_label='fake_app',
 ...     module='fake_project.fake_app.no_models',