Changeset 740

Timestamp:

09/30/05 07:16:43 (3 years ago)

Author:

rjwittams

Message:

Initial checkin of new admin branch. Ticket #535. I've tried to cover the changes below, but may have forgotten some.

M django/conf/urls/admin.py
Modified to allow running the old and new code in parallel. Simply add _old on the end of a change or add form to check against the behaviour of the old admin.
eg http://myadmin/auth/users/1/ -> http://myadmin/auth/users/1_old/

A django/conf/admin_templates/admin_change_form.html
A django/conf/admin_templates/admin_edit_inline_stacked.html
A django/conf/admin_templates/admin_field.html
A django/conf/admin_templates/admin_field_widget.html
A django/conf/admin_templates/admin_edit_inline_tabular.html

These are templates extracted from the admin code that are now used to render the views.

M django/conf/admin_media/js/urlify.js

Change to dashes rather than underscores in slug fields.

M django/core/formfields.py

All of the data conversion from POST to something fields can understand now takes place here.

M django/core/meta/init.py

Added InlineRelatedObject? and added manipulator methods for data flattening.
Also includes a fix to ordering descending select= fields.

M django/core/meta/fields.py

Data flattening pushed down into fields.

M django/core/defaulttags.py

Added "include" tag, which is like ssi parsed, but uses normal template resolution rather than absolute paths.

M django/core/validators.py

Allow dashes in slugfields.

A django/templatetags/admin_modify.py

A new set of template tags to provide functionality for the admin.

M django/views/admin/main.py

New view functions for add and change. New helper objects for the admin templates to access ( BoundField?, AdminFieldSet?)

M tests/runtests.py

Show the details of an error rather than assuming the existance of a database.

Files:

• django/branches/new-admin/django/conf/admin_media/js/urlify.js (modified) (1 diff)
• django/branches/new-admin/django/conf/admin_templates/admin_change_form.html (added)
• django/branches/new-admin/django/conf/admin_templates/admin_edit_inline_stacked.html (added)
• django/branches/new-admin/django/conf/admin_templates/admin_edit_inline_tabular.html (added)
• django/branches/new-admin/django/conf/admin_templates/admin_field.html (added)
• django/branches/new-admin/django/conf/admin_templates/admin_field_widget.html (added)
• django/branches/new-admin/django/conf/urls/admin.py (modified) (1 diff)
• django/branches/new-admin/django/core/defaulttags.py (modified) (4 diffs)
• django/branches/new-admin/django/core/formfields.py (modified) (19 diffs)
• django/branches/new-admin/django/core/meta/fields.py (modified) (15 diffs)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (8 diffs)
• django/branches/new-admin/django/core/validators.py (modified) (2 diffs)
• django/branches/new-admin/django/templatetags/admin_modify.py (added)
• django/branches/new-admin/django/views/admin/main.py (modified) (11 diffs)
• django/branches/new-admin/tests/runtests.py (modified) (1 diff)

django/branches/new-admin/django/conf/admin_media/js/urlify.js

@@ -11 +11 @@
-    s = s.replace(/[^\w\s]/g, '');   // remove unneeded chars
-    s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
-_');      // convert spaces to underscor
+-');      // convert spaces to dash
-    s = s.toLowerCase();             // convert to lowercase
-    return s.substring(0, num_chars);// trim to first num_chars chars

django/branches/new-admin/django/conf/urls/admin.py

@@ -49 +49 @@
-urlpatterns += (
-    # Metasystem admin pages
+    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add_old/$', 'django.views.admin.main.add_stage'),
+    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)_old/$', 'django.views.admin.main.change_stage'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/$', 'django.views.admin.main.change_list'),
-
+_new
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/jsvalidation/$', 'django.views.admin.jsvalidation.jsvalidation'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.views.admin.main.history'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.views.admin.main.delete_stage'),
-
+_new
-)
-urlpatterns = patterns('', *urlpatterns)

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

@@ -3 +3 @@
-import sys
-import template
+import template_loader
-
-class CommentNode(template.Node):
@@ -224 +225 @@
-        return output
-
+class IncludeNode(template.Node):
+    def __init__(self, template_path):
+        self.template_path_var = template_path_var
+
+    def render(self, context):
+         try:
+             template_path = template.resolve(self.template_path_var, context)
+             t = template_loader.get_template(template_path)
+             return t.render(context)
+         except:
+             return '' # Fail silently for invalid included templates.
+
+
-class LoadNode(template.Node):
-    def __init__(self, taglib):
@@ -601 +615 @@
-    return SsiNode(bits[1], parsed)
-
+def do_include(parser, token):
+    """
+    Loads a template using standard resolution mechanisms, and renders it in the current context.     
+    """
+    bits = token.contents.split()
+    parsed = False
+    if len(bits) != 2:
+        raise template.TemplateSyntaxError, "'include' tag takes one argument: the path to the template to be included"
+    return IncludeNode(bits[1])
+
-def do_load(parser, token):
-    """
@@ -756 +780 @@
-template.register_tag('if', do_if)
-template.register_tag('ifchanged', do_ifchanged)
+template.register_tag('include', do_include)
-template.register_tag('regroup', do_regroup)
-template.register_tag('ssi', do_ssi)

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

@@ -23 +23 @@
-            if field.field_name == field_name:
-                return field
-" % field_name
+\n%s" % (field_name, repr(self.fields)) 
-
-    def __delitem__(self, field_name):
@@ -88 +88 @@
-        expected to deal with invalid input.
-        """
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-class FormWrapper:
@@ -105 +101 @@
-    prepopulated data and validation error messages to the formfield objects.
-    """
-
+, edit_inline = False
-        self.manipulator, self.data = manipulator, data
-        self.error_dict = error_dict
+        self._inline_collections = None
+        self.edit_inline = edit_inline
-
-    def __repr__(self):
-data
+__dict__
-
-    def __getitem__(self, key):
-        for field in self.manipulator.fields:
-            if field.field_name == key:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        raise KeyError
+
+    def fill_inline_collections(self): 
+        if not self._inline_collections:
+            ic = []
+            related_objects = self.manipulator.get_inline_related_objects_wrapped()
+            for rel_obj in related_objects:
+                data = rel_obj.extract_data(self.data)
+                inline_collection = InlineObjectCollection(self.manipulator, rel_obj, data, self.error_dict)
+                ic.append(inline_collection)
+            self._inline_collections = ic
+
+
-
-    def has_errors(self):
@@ -136 +147 @@
-        "Renders the field"
-        return str(self.formfield.render(self.data))
+            
-
-    def __repr__(self):
@@ -156 +168 @@
-            return ''
-
+    def get_id(self):
+        return  self.formfield.get_id()
+
-class FormFieldCollection(FormFieldWrapper):
-    "A utility class that gives the template access to a dict of FormFieldWrappers"
@@ -175 +190 @@
-        errors = []
-        for field in self.formfield_dict.values():
-
+
+
-        return errors
+
+    def has_errors(self):
+        return bool(len(self.errors())) 
+        
+    def html_combined_error_list(self):
+        return ''.join( [ field.html_error_list() for field in self.formfield_dict.values() if hasattr(field, 'errors')])
+
+class InlineObjectCollection:
+    "An object that acts like a list of form field collections."  
+    def __init__(self, parent_manipulator,  rel_obj, data, errors):
+        self.parent_manipulator = parent_manipulator 
+        self.rel_obj = rel_obj
+        self.data = data
+        self.errors = errors
+        self._collections = None   
+        self.name = rel_obj.name
+ 
+    def __len__(self):
+        self.fill() 
+        return self._collections.__len__()
+    
+    def __getitem__(self, k):
+        self.fill()
+        return self._collections.__getitem__(k)
+
+    def __setitem__(self, k, v):
+        self.fill()
+        return self._collections.__setitem__(k,v)
+
+    def __delitem__(self, k):
+        self.fill()
+        return self._collections.__delitem__(k)
+
+    def __iter__(self):
+        self.fill()
+        return self._collections.__iter__()
+
+    def fill(self):
+        if self._collections:
+            return 
+        else:
+            var_name = self.rel_obj.opts.object_name.lower()
+            wrapper = []
+            orig = hasattr(self.parent_manipulator, 'original_object') and self.parent_manipulator.original_object  or None 
+            orig_list = self.rel_obj.get_list(orig)
+            for i, instance in enumerate(orig_list):
+                collection = {'original': instance }
+                for f in self.rel_obj.editable_fields():
+                        for field_name in f.get_manipulator_field_names(''):
+                            full_field_name = '%s.%d.%s' % (var_name, i, field_name)
+                            field = self.parent_manipulator[full_field_name]
+                            data = field.extract_data(self.data)
+                            errors = self.errors.get(full_field_name, [])
+#                           if(errors):raise full_field_name + " " + repr(errors)
+                            collection[field_name] = FormFieldWrapper(field, data, errors)
+                wrapper.append(FormFieldCollection(collection))
+            self._collections = wrapper 
-
-class FormField:
@@ -210 +283 @@
-        raise NotImplementedError
-
+    def get_member_name(self):
+        if hasattr(self, 'member_name'):
+            return self.member_name
+        else:
+            return self.field_name
+
+    def extract_data(self, data_dict):
+        if hasattr(self, 'requires_data_list') and hasattr(data_dict, 'getlist'):
+            data = data_dict.getlist(self.get_member_name())
+        else:
+            data = data_dict.get(self.get_member_name(), None)
+        if data is None:
+            data = ''
+        self.data_dict = data_dict  
+        return data
+
+    def convert_post_data(self, new_data):
+        name = self.get_member_name()
+        if new_data.has_key(name):
+            d = new_data.getlist(name)
+            #del new_data[self.field_name]
+            new_data.setlist(name,
+                    [self.__class__.html2python(data) 
+                     for data in d])
+        else:
+            try:
+               # individual fields deal with None values themselves
+               new_data.setlist(name, [self.__class__.html2python(None)])
+            except EmptyValue:
+               new_data.setlist(name, [])
+
+    def get_id(self):
+        return  FORM_FIELD_ID_PREFIX + self.field_name  
-####################
-# GENERIC WIDGETS  #
@@ -238 +344 @@
-            data = data.encode('utf-8')
-        return '<input type="text" id="%s" class="v%s%s" name="%s" size="%s" value="%s" %s/>' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            self.field_name, self.length, escape(data), maxlength)
-
@@ -249 +355 @@
-        # value is always blank because we never want to redisplay it
-        return '<input type="password" id="%s" class="v%s%s" name="%s" value="" />' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            self.field_name)
-
@@ -267 +373 @@
-            data = data.encode('utf-8')
-        return '<textarea id="%s" class="v%s%s" name="%s" rows="%s" cols="%s">%s</textarea>' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            self.field_name, self.rows, self.cols, escape(data))
-
@@ -277 +383 @@
-    def render(self, data):
-        return '<input type="hidden" id="%s" name="%s" value="%s" />' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-
-class CheckboxField(FormField):
@@ -290 +396 @@
-            checked_html = ' checked="checked"'
-        return '<input type="checkbox" id="%s" class="v%s" name="%s"%s />' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            self.field_name, checked_html)
-
@@ -300 +406 @@
-    html2python = staticmethod(html2python)
-
+
-class SelectField(FormField):
-
+, member_name=None
-        self.field_name = field_name
-        # choices is a list of (value, human-readable key) tuples because order matters
-        self.choices, self.size, self.is_required = choices, size, is_required
-        self.validator_list = [self.isValidChoice] + validator_list
-
-
+
+
+
+
+
-        output = ['<select id="%s" class="v%s%s" name="%s" size="%s">' % \
-
-
-
+
+
-        for value, display_name in self.choices:
-            selected_html = ''
@@ -335 +444 @@
-
-class RadioSelectField(FormField):
-
+, member_name=None
-        self.field_name = field_name
-        # choices is a list of (value, human-readable key) tuples because order matters
@@ -341 +450 @@
-        self.validator_list = [self.isValidChoice] + validator_list
-        self.ul_class = ul_class
+        if member_name != None:
+            self.member_name = member_name
-
-    def render(self, data):
@@ -383 +494 @@
-                'name': display_name,
-                'field': '<input type="radio" id="%s" name="%s" value="%s"%s/>' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-                'label': '<label for="%s">%s</label>' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            })
-        return RadioFieldRenderer(datalist, self.ul_class)
@@ -415 +526 @@
-    def render(self, data):
-        output = ['<select id="%s" class="v%s%s" name="%s" size="%s" multiple="multiple">' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            self.field_name, self.size)]
-        str_data_list = map(str, data) # normalize to strings
@@ -470 +581 @@
-                checked_html = ' checked="checked"'
-            field_name = '%s%s' % (self.field_name, value)
-%s" class="v%s" name="%s"%s /> <label for="%s
-FORM_FIELD_ID_PREFIX, field_name
-FORM_FIELD_ID_PREFIX, field_nam
+" class="v%s" name="%s"%s /> <label for="
+get_id() + value 
+get_id() + valu
-        output.append('</ul>')
-        return '\n'.join(output)
@@ -491 +602 @@
-    def render(self, data):
-        return '<input type="file" id="%s" class="v%s" name="%s" />' % \
-FORM_FIELD_ID_PREFIX + self.field_name
+self.get_id()
-            self.field_name)
-

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

@@ -17 +17 @@
-
-# Values for Relation.edit_inline.
-1, 2
+"admin_edit_inline_tabular", "admin_edit_inline_stacked"
-
-RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
@@ -156 +156 @@
-                return self.default.__get_value__()
-            return self.default
-
+not self.empty_strings_allowed or 
-            return None
-        return ""
@@ -164 +164 @@
-        Returns a list of field names that this object adds to the manipulator.
-        """
-name
+column
-
-    def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False):
@@ -178 +178 @@
-            params['maxlength'] = self.maxlength
-        if isinstance(self.rel, ManyToOne):
+            params['member_name'] = name_prefix + self.get_db_column()
-            if self.rel.raw_id_admin:
-                field_objs = self.get_manipulator_field_objs()
@@ -184 +185 @@
-                if self.radio_admin:
-                    field_objs = [formfields.RadioSelectField]
-                    params['choices'] = self.get_choices(include_blank=self.blank, blank_choice=BLANK_CHOICE_NONE)
-                    params['ul_class'] = get_ul_class(self.radio_admin)
-                else:
@@ -191 +191 @@
-                    else:
-                        field_objs = [formfields.SelectField]
-    params['choices'] = self.get_choices
+params['choices'] = self.get_choices_default
-        elif self.choices:
-            if self.radio_admin:
-                field_objs = [formfields.RadioSelectField]
-                params['choices'] = self.get_choices(include_blank=self.blank, blank_choice=BLANK_CHOICE_NONE)
-                params['ul_class'] = get_ul_class(self.radio_admin)
-            else:
-                field_objs = [formfields.SelectField]
-
+
+
-        else:
-            field_objs = self.get_manipulator_field_objs()
@@ -259 +259 @@
-            return val
-
+
-    def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
-        "Returns a list of tuples used as SelectField choices for this field."
+       
-        first_choice = include_blank and blank_choice or []
-        if self.choices:
-            return first_choice + list(self.choices)
-        rel_obj = self.rel.to
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-class AutoField(Field):
-    empty_strings_allowed = False
@@ -275 +301 @@
-    def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False):
-        if not rel:
-
+hange c
-        return Field.get_manipulator_fields(self, opts, manipulator, change, name_prefix, rel)
-
@@ -330 +356 @@
-    def get_manipulator_field_objs(self):
-        return [formfields.DateField]
+
+    def flatten_data(self, obj = None):
+        val = self._get_val_from_obj(obj)
+        return {self.get_db_column(): (val is not None and val.strftime("%Y-%m-%d") or '')}
-
-class DateTimeField(DateField):
@@ -359 +389 @@
-            return datetime.datetime.combine(d, t)
-        return self.get_default()
+
+    def flatten_data(self,obj = None):
+        val = self._get_val_from_obj(obj) 
+        date_field, time_field = self.get_manipulator_field_names('')
+        return {date_field: (val is not None and val.strftime("%Y-%m-%d") or ''),
+                time_field: (val is not None and val.strftime("%H:%M:%S") or '')}
-
-class EmailField(Field):
@@ -543 +579 @@
-        return [formfields.TimeField]
-
+    def flatten_data(self,obj = None):
+        val = self._get_val_from_obj(obj) 
+        return {self.get_db_column(): (val is not None and val.strftime("%H:%M:%S") or '')} 
+
-class URLField(Field):
-    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
@@ -598 +638 @@
-    def get_manipulator_field_objs(self):
-        return [formfields.IntegerField]
+
+    def flatten_data(self, obj = None):
+        if not obj: 
+            # In required many-to-one fields with only one available choice,
+            # select that one available choice. Note: We have to check that
+            # the length of choices is *2*, not 1, because SelectFields always
+            # have an initial "blank" value.
+            if not self.blank and not self.rel.raw_id_admin and self.choices:
+               choice_list = self.get_choices_default()
+               if len(choice_list) == 2:
+                  return { self.name : choice_list[1][0] }
+        return Field.flatten_data(self, obj)
-
-class ManyToManyField(Field):
@@ -616 +668 @@
-            return [formfields.CommaSeparatedIntegerField]
-        else:
-(include_blank=False
+_default(
-            return [curry(formfields.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]
+
+    def get_choices_default(self):
+        return Field.get_choices(self, include_blank=False)
-
-    def get_m2m_db_table(self, original_opts):
@@ -638 +693 @@
-                len(badkeys) == 1 and badkeys[0] or tuple(badkeys),
-                len(badkeys) == 1 and "is" or "are")
+
+    def flatten_data(self, obj = None):
+        new_data = {} 
+        if obj:
+            get_list_func = getattr(obj, 'get_%s_list' % self.rel.singular)
+            instance_ids = [getattr(instance, self.rel.to.pk.column) for instance in get_list_func()]
+            if self.rel.raw_id_admin:
+                 new_data[self.name] = ",".join([str(id) for id in instance_ids])
+            elif not self.rel.edit_inline:
+                 new_data[self.name] = instance_ids 
+        else:
+            # In required many-to-many fields with only one available choice,
+            # select that one available choice.
+            if not self.blank and not self.rel.edit_inline and not self.rel.raw_id_admin and self.choices:
+               choice_list = self.get_choices_default()
+               if len(choice_list) == 1:
+                   new_data[self.name] = [choices_list[0][0]]
+        return new_data
+
-
-class OneToOneField(IntegerField):
@@ -721 +795 @@
-        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. 
+
+        Return value needs to be encapsulated.
-        """
-        if self.fields is None:

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

@@ -146 +146 @@
-class BadKeywordArguments(Exception):
-    pass
+
+
+class InlineRelatedObject(object):
+    def __init__(self,parent_opts, opts, field):
+        self.parent_opts = parent_opts
+        self.opts = opts
+        self.field = field
+        self.name = opts.module_name
+
+    def flatten_data(self,obj = None):
+        var_name = self.opts.object_name.lower()
+        new_data = {}
+        rel_instances = self.get_list(obj)
+
+        for i, rel_instance in enumerate(rel_instances):
+            instance_data = {} 
+            for f in self.opts.fields + self.opts.many_to_many:
+                field_data = f.flatten_data(rel_instance)
+                #if hasattr(f, 'editable') and f.editable and f != self.field:
+                for name, value in field_data.items():
+                    instance_data['%s.%d.%s' % (var_name, i, name)] = value
+            new_data.update(instance_data)             
+    
+        return new_data        
+
+    def extract_data(self, data):
+        "Pull out the data meant for inline objects of this class, ie anything starting with our module name"
+        return data # TODO  
+    
+    def get_list(self, parent_instance = None):
+        "Get the list of this type of object from an instance of the parent class"
+        if parent_instance != None:
+            func_name = 'get_%s_list' % self.parent_opts.get_rel_object_method_name(self.opts, self.field)
+            func = getattr(parent_instance, func_name)
+            list = func()
+            
+            count = len(list) + self.field.rel.num_extra_on_change
+            if self.field.rel.min_num_in_admin:
+               count = max(count, self.field.rel.min_num_in_admin)
+            if self.field.rel.max_num_in_admin:
+               count = min(count, self.field.rel.max_num_in_admin)
+       
+            change = count - len(list) 
+            if change > 0:
+                return list + [None for _ in range(change)]
+            if change < 0:
+                return list[:change]
+            else: # Just right
+                return list
+        else:
+            return [None for _ in range(self.field.rel.num_in_admin)]
+
+    
+    def editable_fields(self, wrapping_func = lambda x: x):
+        """Get the fields in this class that should be edited inline.
+        Pass a callable, eg a class, as the second argument to wrap the fields.
+        This can be useful to add extra attributes for use in templates."""
+        
+        return [wrapping_func(f) for f in self.opts.fields + self.opts.many_to_many if f.editable and f != self.field ]
+        
+    def __repr__(self):
+        return "<InlineRelatedObject: %s related to %s>" % ( self.name, self.field.name)      
+
+        
-
-class Options:
@@ -317 +381 @@
-    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 [InlineRelatedObject(self, opts, field) for opts, field in self.get_all_related_objects() if field.rel.edit_inline]
+
+    def get_data_holders(self):
+        return self.fields + self.many_to_many + self.get_inline_related_objects_wrapped()
-
-    def get_all_related_many_to_many_objects(self):
@@ -595 +665 @@
-
-        for f in opts.fields:
+            #TODO : change this into a virtual function so that user defined fields will be able to add methods to module or class. 
-            if f.choices:
-                # Add "get_thingie_display" method to get human-readable value.
@@ -789 +860 @@
-        if cursor.fetchone():
-            db_values = [f.get_db_prep_save(f.pre_save(getattr(self, f.column), False)) for f in non_pks]
-
-
+
+
+
+
+
+
+
+
-                db_values + [pk_val])
-        else:
@@ -1333 +1410 @@
-            order_by.append(db.get_random_function_sql())
-        else:
+            if f.startswith('-'):
+                col_name = f[1:]
+                order = "DESC"
+            else:
+                col_name = f
+                order = "ASC"
-            # Use the database table as a column prefix if it wasn't given,
-            # and if the requested column isn't a custom SELECT.
-f and f
+col_name and col_name
-                table_prefix = opts.db_table + '.'
-            else:
-                table_prefix = ''
-
-
-
-
+
+
+
-    order_by = ", ".join(order_by)
-
@@ -1398 +1480 @@
-    man.__init__ = curry(manipulator_init, opts, add, change)
-    man.save = curry(manipulator_save, opts, klass, add, change)
+    man.get_inline_related_objects_wrapped = curry(manipulator_get_inline_related_objects_wrapped, opts, klass, add, change)
+    man.flatten_data = curry(manipulator_flatten_data, opts, klass, add, change)
-    for field_name_list in opts.unique_together:
-        setattr(man, 'isUnique%s' % '_'.join(field_name_list), curry(manipulator_validator_unique_together, field_name_list, opts))
@@ -1440 +1524 @@
-
-    # Add fields for related objects.
-rel_opts, rel_field in opts.get_inline_related_objects
+obj in opts.get_inline_related_objects_wrapped
-        if change:
-rel_opts, rel_
-rel_
-rel_
-rel_
-rel_
-rel_
+obj.opts, obj.
+obj.
+obj.
+obj.
+obj.
+obj.
-        else:
-rel_
-rel_opts.fields + rel_
-rel_field and (not f.primary_key or (f.primary_key and change))
+obj.
+obj.opts.fields + obj.
+obj.field 
-                for i in range(count):
-rel_opts, self, change, name_prefix='%s.%d.' % (rel_
+obj.opts, self, change, name_prefix='%s.%d.' % (obj.
-
-    # Add field for ordering.
@@ -1593 +1677 @@
-            getattr(new_object, 'set_%s_order' % rel_opts.object_name.lower())(order)
-    return new_object
+
+def manipulator_get_inline_related_objects_wrapped(opts, klass, add, change, self):
+    return opts.get_inline_related_objects_wrapped() 
+        
+def manipulator_flatten_data(opts, klass, add, change, self):
+     new_data = {}
+     obj = change and self.original_object or None
+     for f in opts.get_data_holders():
+            new_data.update(f.flatten_data(obj))
+     return new_data
-
-def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data):

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

@@ -13 +13 @@
-_datere = r'\d{4}-((?:0?[1-9])|(?:1[0-2]))-((?:0?[1-9])|(?:[12][0-9])|(?:3[0-1]))'
-_timere = r'(?:[01]?[0-9]|2[0-3]):[0-5][0-9](?::[0-5][0-9])?'
-\w
+[\w-]
-alnumurl_re = re.compile(r'^[\w/]+$')
-ansi_date_re = re.compile('^%s$' % _datere)
@@ -54 +54 @@
-def isAlphaNumeric(field_data, all_data):
-    if not alnum_re.search(field_data):
-
+, dashes
-
-def isAlphaNumericURL(field_data, all_data):

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

@@ -1 +1 @@
-# Generic admin views, with admin templates created dynamically at runtime.
-
-
+, template
-from django.core.exceptions import Http404, ObjectDoesNot