Changeset 440

Timestamp:

08/09/05 16:08:00 (3 years ago)

Author:

adrian

Message:

Fixed #211 -- edit_inline_type is deprecated, in favor of edit_inline itself. For example, instead of 'edit_inline=True, edit_inline_type=meta.TABULAR', use 'edit_inline=meta.TABULAR'.

Files:

• django/trunk/django/core/meta/fields.py (modified) (7 diffs)
• django/trunk/django/core/meta/__init__.py (modified) (1 diff)
• django/trunk/django/views/admin/main.py (modified) (2 diffs)
• django/trunk/docs/db-api.txt (modified) (1 diff)
• django/trunk/docs/model-api.txt (modified) (1 diff)
• django/trunk/docs/tutorial02.txt (modified) (2 diffs)

django/trunk/django/core/meta/fields.py

@@ -16 +16 @@
-BLANK_CHOICE_NONE = [("", "None")]
-
-_type
+
-TABULAR, STACKED = 1, 2
-
@@ -532 +532 @@
-            kwargs['verbose_name'] = kwargs.get('verbose_name', to._meta.verbose_name)
-            rel_name = rel_name or to_name
+
+        if kwargs.has_key('edit_inline_type'):
+            import warnings
+            warnings.warn("edit_inline_type is deprecated. Use edit_inline instead.")
+            kwargs['edit_inline'] = kwargs.pop('edit_inline_type')
+
-        kwargs['rel'] = ManyToOne(to, rel_name, to_field,
-            num_in_admin=kwargs.pop('num_in_admin', 3),
@@ -538 +544 @@
-            num_extra_on_change=kwargs.pop('num_extra_on_change', 1),
-            edit_inline=kwargs.pop('edit_inline', False),
-            edit_inline_type=kwargs.pop('edit_inline_type', STACKED),
-            related_name=kwargs.pop('related_name', None),
-            limit_choices_to=kwargs.pop('limit_choices_to', None),
@@ -574 +579 @@
-        to_field = to_field or to._meta.pk.name
-        rel_name = rel_name or to._meta.object_name.lower()
+
+        if kwargs.has_key('edit_inline_type'):
+            import warnings
+            warnings.warn("edit_inline_type is deprecated. Use edit_inline instead.")
+            kwargs['edit_inline'] = kwargs.pop('edit_inline_type')
+
-        kwargs['rel'] = OneToOne(to, rel_name, to_field,
-            num_in_admin=kwargs.pop('num_in_admin', 0),
-            edit_inline=kwargs.pop('edit_inline', False),
-            edit_inline_type=kwargs.pop('edit_inline_type', STACKED),
-            related_name=kwargs.pop('related_name', None),
-            limit_choices_to=kwargs.pop('limit_choices_to', None),
@@ -587 +597 @@
-class ManyToOne:
-    def __init__(self, to, name, field_name, num_in_admin=3, min_num_in_admin=None,
- edit_inline_type=STACKED,
+
-        related_name=None, limit_choices_to=None, lookup_overrides=None, raw_id_admin=False):
-        try:
@@ -597 +607 @@
-        self.num_in_admin, self.edit_inline = num_in_admin, edit_inline
-        self.min_num_in_admin, self.max_num_in_admin = min_num_in_admin, max_num_in_admin
-
-
+
-        self.limit_choices_to = limit_choices_to or {}
-        self.lookup_overrides = lookup_overrides or {}
@@ -622 +631 @@
-class OneToOne(ManyToOne):
-    def __init__(self, to, name, field_name, num_in_admin=0, edit_inline=False,
-edit_inline_type=STACKED, 
+
-        raw_id_admin=False):
-        self.to, self.name, self.field_name = to._meta, name, field_name
-        self.num_in_admin, self.edit_inline = num_in_admin, edit_inline
-edit_inline_type, self.related_name = edit_inline_type,
+related_name =
-        self.limit_choices_to = limit_choices_to or {}
-        self.lookup_overrides = lookup_overrides or {}

django/trunk/django/core/meta/__init__.py

@@ -292 +292 @@
-                link_field = copy.copy(core.RelatedLink._meta.get_field('object_id'))
-                link_field.rel = ManyToOne(self.get_model_module().Klass, 'related_links', 'id',
-rue, edit_inline_type=T
+
-                    lookup_overrides={
-                        'content_type__package__label__exact': self.app_label,

django/trunk/django/views/admin/main.py

@@ -609 +609 @@
-        var_name = rel_obj.object_name.lower()
-        field_list = [f for f in rel_obj.fields + rel_obj.many_to_many if f.editable and f != rel_field]
-_type
+
-        view_on_site = ''
-        if change and hasattr(rel_obj, 'get_absolute_url'):
-            view_on_site = '{%% if %s.original %%}<a href="/r/{{ %s.content_type_id }}/{{ %s.original.id }}/">View on site</a>{%% endif %%}' % (var_name, var_name, var_name)
-_type
+
-            t.append('<h2>%s</h2>\n<table>\n' % capfirst(rel_obj.verbose_name_plural))
-            t.append('<thead><tr>')
@@ -655 +655 @@
-            t.extend(hidden_fields)
-            t.append('{% endfor %}\n')
-_type
+
-            t.append('{%% for %s in form.%s %%}' % (var_name, rel_obj.module_name))
-            t.append('<h2>%s #{{ forloop.counter }}</h2>' % capfirst(rel_obj.verbose_name))

django/trunk/docs/db-api.txt

@@ -21 +21 @@
-    class Choice(meta.Model):
-        fields = (
-True, edit_inline_type=
+
-                num_in_admin=10, min_num_in_admin=5),
-            meta.CharField('choice', maxlength=255, core=True),

django/trunk/docs/model-api.txt

@@ -317 +317 @@
-    Argument                 Description
-    =======================  ============================================================
-``Tru
+not ``Fals
-                             "inline" on the related object's page. This means
-                             that the object will not have its own admin
-
-
-
-
-
-
-
+
+
+
+
-
-    ``limit_choices_to``     A dictionary of lookup arguments and values (see

django/trunk/docs/tutorial02.txt

@@ -243 +243 @@
-field like so::
-
-True
+meta.STACKED
-
-This tells Django: "Choice objects are edited on the Poll admin page. By
@@ -275 +275 @@
-alternate way of displaying inline related objects::
-
-True, num_in_admin=3, edit_inline_type=meta.TABULAR
-
-_type=meta.TABULAR``, the related objects are displayed
-
+meta.TABULAR, num_in_admin=3
+
+=meta.TABULAR`` (instead of ``meta.STACKED``), the
+related objects are displayed 
-
-.. image:: http://media.djangoproject.com/img/doc/tutorial/admin12.png