Changeset 982

Timestamp:

10/20/05 14:07:15 (3 years ago)

Author:

rjwittams

Message:

Rationalised related object methods

Files:

• django/branches/new-admin/django/bin/validate.py (modified) (1 diff)
• django/branches/new-admin/django/contrib/admin/templates/admin/change_form.html (modified) (1 diff)
• django/branches/new-admin/django/contrib/admin/views/main.py (modified) (8 diffs)
• django/branches/new-admin/django/core/formfields.py (modified) (4 diffs)
• django/branches/new-admin/django/core/management.py (modified) (2 diffs)
• django/branches/new-admin/django/core/meta/fields.py (modified) (9 diffs)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (9 diffs)
• django/branches/new-admin/django/core/template/loader.py (modified) (2 diffs)
• django/branches/new-admin/django/core/template/loaders/app_directories.py (modified) (1 diff)
• django/branches/new-admin/django/models/__init__.py (modified) (1 diff)
• django/branches/new-admin/tests/runtests.py (modified) (1 diff)

django/branches/new-admin/django/bin/validate.py

@@ -14 +14 @@
-    for f in opts.fields:
-        if isinstance(f, meta.ManyToManyField):
-
+
+
-    # Inline related objects.
-
-
+
+
+
+
-    # All related objects.
-    related_apps_seen = []
-
-
-
-
+
+
+
+
+
+
+
-    # Etc.
-    if opts.admin is not None:
-
+
+
+
+
-
-if __name__ == "__main__":

django/branches/new-admin/django/contrib/admin/templates/admin/change_form.html

@@ -22 +22 @@
-<form {{ form_enc_attrib }} action='{{ form_url }}' method="post">
-
-
-{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
-{% if save_on_top %}{% submit_row %}{% endif %}
-{% if form.error_dict %}<p class="errornote">Please correct the error{{ form.error_dict.items|pluralize }} below.</p>{% endif %}
-{% for bound_field_set in bound_field_sets %}
-
-
+
-    {% if bound_field_set.name %}<h2>{{bound_field_set.name }}</h2>{% endif %}
-    {% for bound_field_line in bound_field_set %}

django/branches/new-admin/django/contrib/admin/views/main.py

@@ -519 +519 @@
-    return t
-
-admin_field_obj
+field_set
-# Put in any necessary JavaScript imports.
-    js = ['js/core.js', 'js/admin/RelatedObjectLookups.js']
@@ -531 +531 @@
-        js.extend(opts.admin.js)
-    seen_collapse = False
-_, options in admin_field_obj
-options.get('classes', '')
+field_set in field_set
+field_set.classes
-            seen_collapse = True
-            js.append('js/admin/CollapsedFieldsets.js' )
-        try:
-st in options['fields']
-st
+ne in field_set
+ne
-                    if f.rel and isinstance(f, meta.ManyToManyField) and f.rel.filter_interface:
-                        js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
@@ -609 +609 @@
-        
-def fill_extra_context(opts, app_label, context, add=False, change=False, show_delete=False, form_url=''):
-    admin_field_objs = opts.admin.get_field_objs(opts)
-    
-    ordered_objects = opts.get_ordered_objects()[:]
-    auto_populated_fields = [f for f in opts.fields if f.prepopulate_from]
-
-
-
-
-
-
-
-
+
+
-    has_absolute_url = hasattr(opts.get_model_module().Klass, 'get_absolute_url')
-    
-    form_enc_attrib = opts.has_field_type(meta.FileField) and 'enctype="multipart/form-data" ' or ''
-
-    form = context['form']
-    original = context['original']
@@ -631 +621 @@
-    bound_field_sets = [field_set.bind(form, original, AdminBoundFieldSet) 
-                        for field_set in field_sets]
-
-
-
-
-
+
+
+
+
-    ordered_object_names =   ' '.join(['object.%s' % o.pk.name for o in ordered_objects])
-   
@@ -740 +729 @@
-        raise Http404
-
-    inline_related_objects = opts.get_inline_related_objects()
-    if request.POST:
-        new_data = request.POST.copy()
@@ -807 +795 @@
-    form.order_objects = []
-    
-
-
-
+
+
+
+
+
+
-            form.order_objects.extend(orig_list)
-
+
-    c = Context(request, {
-        'title': 'Change %s' % opts.verbose_name,
@@ -837 +828 @@
-        return # Avoid recursing too deep.
-    objects_seen = []
-_opts, rel_fiel
-_
+ate
+ated.
-            continue
-        objects_seen.append(rel_opts)
-_opts, rel_
-_
+ated.opts, related.
+ated.
-            try:
-                sub_obj = getattr(obj, 'get_%s' % rel_opts_name)()
@@ -849 +840 @@
-            else:
-                if rel_opts.admin:
-_opts.app_label, rel_
+ated.opts.app_label, related.
-                    if not user.has_perm(p):
-_
+ated.
-                        # We don't care about populating deleted_objects now.
-                        continue
-_field.rel.edit_inline or not rel_
+ated.field.rel.edit_inline or not related.
-                    # Don't display link to edit, because it either has no
-                    # admin or is edited inline.
-_
+ated.
-                else:
-                    # Display a link to the admin page.
-                    nh(deleted_objects, current_depth, ['%s: <a href="../../../../%s/%s/%s/">%r</a>' % \
-_opts.verbose_name), rel_opts.app_label, rel_
-_
-_
+ated.opts.verbose_name), related.opts.app_label, related.
+ated.
+ated.
-        else:
-            has_related_objs = False
-            for sub_obj in getattr(obj, 'get_%s_list' % rel_opts_name)():
-                has_related_objs = True
-_field.rel.edit_inline or not rel_
+ated.field.rel.edit_inline or not related.
-                    # Don't display link to edit, because it either has no
-                    # admin or is edited inline.
-_
+ated.
-                else:
-                    # Display a link to the admin page.
-                    nh(deleted_objects, current_depth, ['%s: <a href="../../../../%s/%s/%s/">%s</a>' % \
-_opts.verbose_name), rel_opts.app_label, rel_
-_
+ated.opts.verbose_name), related.opts.app_label, related.
+ated.
-            # If there were related objects, and the user doesn't have
-            # permission to delete them, add the missing perm to perms_needed.
-_
-_opts.app_label, rel_
+ated.
+ated.opts.app_label, related.
-                if not user.has_perm(p):
-                    perms_needed.add(rel_opts.verbose_name)

django/branches/new-admin/django/core/formfields.py

@@ -89 +89 @@
-        expected to deal with invalid input.
-        """
-
-
-
-
-
-
+
+
-
-class FormWrapper:
@@ -102 +98 @@
-    prepopulated data and validation error messages to the formfield objects.
-    """
-Fals
+Tru
-        self.manipulator, self.data = manipulator, data
-        self.error_dict = error_dict
-        self._inline_collections = None
-        self.edit_inline = edit_inline
-
+
-    def __repr__(self):
-        return repr(self.__dict__)
@@ -247 +243 @@
-                            collection[field_name] = FormFieldWrapper(field, data, errors)
-                wrapper.append(FormFieldCollection(collection))
- 
+
-
-class FormField:
@@ -294 +290 @@
-        if data is None:
-            data = ''
-       
+    
-
-    def convert_post_data(self, new_data):

django/branches/new-admin/django/core/management.py

@@ -302 +302 @@
-        cursor.execute("INSERT INTO %s (domain, name) VALUES ('mysite.com', 'My Django site')" % core.Site._meta.db_table)
-    except Exception, e:
-
+ 
-        try:
-            db.db.rollback()
-        except UnboundLocalError:
-            pass
-sys.exit(1)
+raise
-    else:
-        db.db.commit()
@@ -583 +583 @@
-
-            # Check core=True, if needed.
-_opts, rel_field in opts.get_inline
+ated in opts.get_followed
-                try:
-_
+ated.
-                        if f.core:
-                            raise StopIteration
-_opts, "At least one field in %s should have core=True, because it's being edited inline by %s.%s." % (rel_
+ated.opts, "At least one field in %s should have core=True, because it's being edited inline by %s.%s." % (related.
-                except StopIteration:
-                    pass

django/branches/new-admin/django/core/meta/fields.py

@@ -49 +49 @@
-    raise validators.ValidationError, "%s with this %s already exists." % (capfirst(opts.verbose_name), f.verbose_name)
-
+class BoundField(object):
+    def __init__(self, field, field_mapping, original):
+        self.field = field
+        self.original = original
+        self.form_fields = self.resolve_form_fields(field_mapping)
+
+    def resolve_form_fields(self, field_mapping):
+        return [field_mapping[name] for name in self.field.get_manipulator_field_names('')]
+
+    def as_field_list(self):
+        return [self.field]
+
+    def original_value(self):
+        if self.original:
+            return self.original.__dict__[self.field.column] 
+
+    def __repr__(self):
+        return "BoundField:(%s, %s)" %( self.field.name, self.form_fields)
+
-class Field(object):
-
+
-    # Designates whether empty strings fundamentally are allowed at the
-    # database level.
@@ -284 +303 @@
-        Returns a dictionary mapping the field's manipulator field names to its
-        "flattened" string values for the admin view. Obj is the instance to extract the 
- 
+
-        """
-        return { self.get_db_column(): self._get_val_from_obj(obj)}
@@ -293 +312 @@
-        else:
-            return self.editable
+        
+    def bind(self, fieldmapping, original, bound_field_class=BoundField):
+        return bound_field_class(self, fieldmapping, original)
- 
-class AutoField(Field):
@@ -659 +681 @@
-
-    def flatten_data(self, follow, obj = None):
- 
+
-            # In required many-to-one fields with only one available choice,
-            # select that one available choice. Note: We have to check that
@@ -730 +752 @@
-                   new_data[self.name] = [choices_list[0][0]]
-        return new_data
-
-
-class OneToOneField(IntegerField):
@@ -797 +818 @@
-        self.raw_id_admin = raw_id_admin
-
-
-class BoundField(object):
-    def __init__(self, field, field_mapping, original):
-        self.field = field
-        self.form_fields = self.resolve_form_fields(field_mapping)
-        self.original = original
-
-    def resolve_form_fields(self, field_mapping):
-        return [field_mapping[name] for name in self.field.get_manipulator_field_names('')]
-
-    def as_field_list(self):
-        return [self.field]
-
-    def original_value(self):
-        return self.original.__dict__[self.field.name] 
-
-    def __repr__(self):
-        return "BoundField:(%s, %s)" %( self.field.name, self.form_fields)
-
-class BoundFieldLine(object):
-    def __init__(self, field_line, field_mapping, original, bound_field_class=BoundField):
-
+
+
-    
-    def __iter__(self):
@@ -882 +885 @@
-        return len(self.field_lines)
-
-
-class Admin:
-    def __init__(self, fields=None, js=None, list_display=None, list_filter=None, date_hierarchy=None,
@@ -894 +896 @@
-        self.search_fields = search_fields or []
-        self.save_on_top = save_on_top
-
-    def get_field_objs(self, opts):
-        """
-        Returns self.fields, except with fields as Field objects instead of
-        field names. If self.fields is None, defaults to putting every
-        non-AutoField field with editable=True in a single fieldset.
-        
-        returns a list of lists of name, dict 
-        the dict has attribs 'fields' and maybe 'classes'. 
-        fields is a list of subclasses of Field. 
-        """
-        if self.fields is None:
-            field_struct = ((None, {'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, AutoField)]}),)
-        else:
-            field_struct = self.fields
-        new_fieldset_list = []
-        for fieldset in field_struct:
-            new_fieldset = [fieldset[0], {}]
-            new_fieldset[1].update(fieldset[1])
-            admin_fields = []
-            for field_name_or_list in fieldset[1]['fields']:
-                if isinstance(field_name_or_list, basestring):
-                    admin_fields.append([opts.get_field(field_name_or_list)])
-                else:
-                    admin_fields.append([opts.get_field(field_name) for field_name in field_name_or_list])
-            new_fieldset[1]['fields'] = admin_fields
-            new_fieldset_list.append(new_fieldset)
-        return new_fieldset_list
-    
-    def get_field_sets(self, opts):
@@ -931 +905 @@
-            field_struct = self.fields
-            
-        
-        new_fieldset_list = []
-        for fieldset in field_struct:
-            name = fieldset[0]
-            fs_options = fieldset[1]
-None
+() 
-            line_specs = fs_options['fields']
-            new_fieldset_list.append(FieldSet(name, classes, opts.get_field, line_specs) )

django/branches/new-admin/django/core/meta/__init__.py

@@ -251 +251 @@
-        return fields
-
+class BoundRelatedObject(object):
+    pass
-
-class Options:
@@ -402 +404 @@
-                    for f in klass._meta.fields:
-                        if f.rel and self == f.rel.to:
-(
+RelatedObject(self, 
-            if self.has_related_links:
-                # Manually add RelatedLink objects, which are a special case.
@@ -416 +418 @@
-                        'content_type__python_module_name__exact': self.module_name,
-                    })
-(
+RelatedObject(self, 
-            self._all_related_objects = rel_objs
-            return rel_objs
-
-    def get_inline_related_objects(self):
-        return [(a, b) for a, b in self.get_all_related_objects() if b.rel.edit_inline]
-
-    def get_inline_related_objects_wrapped(self):
-        return [RelatedObject(self, opts, field) for opts, field in self.get_all_related_objects() if field.rel.edit_inline]
-
-    def get_all_related_objects_wrapped(self):
-        return [RelatedObject(self, opts, field) for opts, field in self.get_all_related_objects()]
-
-    def get_followed_related_objects(self, follow=None):
-        if follow == None:
-            follow = self.get_follow()
-_wrapped
+
-
-    def get_data_holders(self, follow=None):
-        if follow == None :
-            follow = self.get_follow()
-_wrapped
+
-
-    def get_follow(self, override=None):
-        follow = {}
-_wrapped
+
-            if override and override.has_key(f.name):
-                child_override = override[f.name] 
@@ -477 +470 @@
-        return self._ordered_objects
-
-
+, follow
-        """
-        Returns True if this object's admin form has at least one of the given
@@ -492 +485 @@
-                        raise StopIteration
-                # Failing that, check related fields.
-_obj, rel_field in self.get_inline_related_objects(
-_obj
+ated in self.get_followed_related_objects(follow
+ated.opts
-                        if isinstance(f, field_type):
-                            raise StopIteration
@@ -854 +847 @@
-                    # Replace all relationships to the old class with
-                    # relationships to the new one.
-_opts, rel_fiel
-_
+ate
+ated.
-                    for rel_opts, rel_field in model._meta.get_all_related_many_to_many_objects():
-                        rel_field.rel.to = opts
@@ -955 +948 @@
-        self._pre_delete()
-    cursor = db.db.cursor()
-_opts, rel_fiel
-_opts, rel_
-_
+ate
+ated.opts, related.
+ated.
-            try:
-                sub_obj = getattr(self, 'get_%s' % rel_opts_name)()
@@ -1584 +1577 @@
-
-    # Add fields for related objects.
-_wrapped
+
-        if self.follow.get(f.name, False):
-            fol = self.follow[f.name]
@@ -1639 +1632 @@
-    expanded_data = DotExpandedDict(new_data.data)
-    # Save many-to-one objects. Example: Add the Choice objects for a Poll.
-_wrapped
+
-        # Create obj_list, which is a DotExpandedDict such as this:
-        # [('0', {'id': ['940'], 'choice': ['This is the first choice']}),

django/branches/new-admin/django/core/template/loader.py

@@ -31 +31 @@
-        mod = __import__(module, globals(), locals(), [attr])
-    except ImportError, e:
+        raise e
-        raise ImproperlyConfigured, 'Error importing template source loader %s: "%s"' % (module, e)
-    try:
@@ -43 +44 @@
-
-class LoaderOrigin(Origin):
-
+display_
-        def reload():
-                return loader(name, dirs)[0]
-
+display_
-        self._reload = reload
-    

django/branches/new-admin/django/core/template/loaders/app_directories.py

@@ -8 +8 @@
-app_template_dirs = []
-for app in INSTALLED_APPS:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-# It won't change, so convert it to a tuple to save memory.
-app_template_dirs = tuple(app_template_dirs)

django/branches/new-admin/django/models/__init__.py

@@ -20 +20 @@
-        # Add "get_thingie", "get_thingie_count" and "get_thingie_list" methods
-        # for all related objects.
-_obj, rel_fiel
+ate
-            # Determine whether this related object is in another app.
-            # If it's in another app, the method names will have the app
-            # label prepended, and the add_BLAH() method will not be
-            # generated.
-_obj
-_obj, rel_
-_
+ated.opts
+ated.opts, related.
+ated.
-                # Add "get_thingie" methods for one-to-one related objects.
-                # EXAMPLE: Place.get_restaurants_restaurant()
-_
-_obj.app_label, rel_obj
+ated.
+ated.opts.app_label, related.opts
-                setattr(klass, 'get_%s' % rel_obj_name, func)
-_
+ated.
-                # Add "get_thingie" methods for many-to-one related objects.
-                # EXAMPLE: Poll.get_choice()
-
-
+
+
+
-                setattr(klass, 'get_%s' % rel_obj_name, func)
-                # Add "get_thingie_count" methods for many-to-one related objects.
-                # EXAMPLE: Poll.get_choice_count()
-
-
+
+
+
-                setattr(klass, 'get_%s_count' % rel_obj_name, func)
-                # Add "get_thingie_list" methods for many-to-one related objects.
-                # EXAMPLE: Poll.get_choice_list()
-
-
+
+
+
-                setattr(klass, 'get_%s_list' % rel_obj_name, func)
-                # Add "add_thingie" methods for many-to-one related objects,
-                # but only for related objects that are in the same app.
-                # EXAMPLE: Poll.add_choice()
-_obj
-_obj, rel_mod, rel_
+ated.opts
+ated.opts, rel_mod, related.
-                    func.alters_data = True
-                    setattr(klass, 'add_%s' % rel_obj_name, func)
-                del func
-_obj, rel_fiel
+ate
-
-        # Do the same for all related many-to-many objects.

django/branches/new-admin/tests/runtests.py

@@ -101 +101 @@
-            try:
-                cursor.execute("CREATE DATABASE %s" % TEST_DATABASE_NAME)
+                print "created"
-            except Exception, e:
-                self.output(0, "There was an error creating the test database:%s " % str(e))