Changeset 773

Timestamp:

10/04/05 11:35:39 (3 years ago)

Author:

rjwittams

Message:

Added templates for 'funny' widgets here: django/conf/admin_templates/widget
Added a follow argument to manipulators. This allows you to exclude/include fields and related objects ( recursively), defaulting to current behaviour, meaning that forms can modify a subset of fields. This should fix #445. Fixed update generic view to use this (will change others soon). Merged to trunk r772.

Files:

• django/branches/new-admin/django/conf/admin_templates/widget (added)
• django/branches/new-admin/django/conf/admin_templates/widget/date_time.html (added)
• django/branches/new-admin/django/conf/admin_templates/widget/default.html (added)
• django/branches/new-admin/django/conf/admin_templates/widget/file.html (added)
• django/branches/new-admin/django/conf/admin_templates/widget/foreign.html (added)
• django/branches/new-admin/django/conf/admin_templates/widget/many_to_many.html (added)
• django/branches/new-admin/django/core/meta/fields.py (modified) (1 diff)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (9 diffs)
• django/branches/new-admin/django/views/generic/create_update.py (modified) (3 diffs)
• django/branches/new-admin/docs/outputting_pdf.txt (modified) (1 diff)
• django/branches/new-admin/docs/templates_python.txt (modified) (1 diff)

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

@@ -640 +640 @@
-
-    def get_db_prep_save(self,value):
-
-
-
-
-
+
+
+
+
+
+
+
+
-    def flatten_data(self, obj = None):
-        if not obj: 

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

@@ -148 +148 @@
-
-
-Inline
+
-    def __init__(self,parent_opts, opts, field):
-        self.parent_opts = parent_opts
-        self.opts = opts
-        self.field = field
+        self.edit_inline = field.rel.edit_inline
-        self.name = opts.module_name
+        self.var_name = opts.object_name.lower()
-
-    def flatten_data(self,obj = None):
-        var_name = self.opts.object_name.lower()
-        new_data = {}
-        rel_instances = self.get_list(obj)
@@ -166 +167 @@
-                #if hasattr(f, 'editable') and f.editable and f != self.field:
-                for name, value in field_data.items():
-
+self.
-            new_data.update(instance_data)             
-    
@@ -205 +206 @@
-        
-        return [wrapping_func(f) for f in self.opts.fields + self.opts.many_to_many if f.editable and f != self.field ]
+      
+    def get_follow(self, override=None):
+        if override:
+            over = override.copy()
+        elif self.edit_inline:
+            over = {}
+        else:
+            return None
-        
+        over[self.field.name] = False
+        return self.opts.get_follow(over)
+    
+    
-    def __repr__(self):
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
+
+        for i in range(count):
+            for f in self.opts.fields + self.opts.many_to_many:
+                    if follow.get(f.name, False):
+                        prefix = '%s.%d.' % (self.var_name, i)
+                        fields.extend(
+                             f.get_manipulator_fields(self.opts, manipulator, change, name_prefix=prefix, rel=True))
+
+        return fields
+
-
-class Options:
@@ -383 +419 @@
-
-    def get_inline_related_objects_wrapped(self):
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def get_all_related_many_to_many_objects(self):
@@ -1489 +1549 @@
-    return man
-
-
+
+
+
-    if change:
-        assert obj_key is not None, "ChangeManipulator.__init__() must be passed obj_key parameter."
@@ -1513 +1575 @@
-                raise
-    self.fields = []
+
-    for f in opts.fields + opts.many_to_many:
-
+
+
-            self.fields.extend(f.get_manipulator_fields(opts, self, change))
-
-    # Add fields for related objects.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    # Add field for ordering.
@@ -1541 +1610 @@
-    params = {}
-    for f in opts.fields:
+        auto_now_add = change and getattr(f, 'auto_now_add', False)
+        if self.follow.get(f.name, None) and not auto_now_add:
+            param = f.get_manipulator_new_data(new_data)
+        else:
+            param = getattr(self.original_object, f.column)
+        params[f.column] = param    
+    
-        # Fields with auto_now_add are another special case; they should keep
-        # their original value in the change stage.
-
-
-
-
+#
+#
+#
+#
-
-    if change:
@@ -1569 +1645 @@
-    # Save many-to-many objects. Example: Poll.set_sites()
-    for f in opts.many_to_many:
-
-
-
-
-
+
+
+
+
+
+
+
-    # Save many-to-one objects. Example: Add the Choice objects for a Poll.
-_opts, rel_field in opts.get_inline_related_objects
+ated in opts.get_all_related_objects_wrapped
-        # Create obj_list, which is a DotExpandedDict such as this:
-        # [('0', {'id': ['940'], 'choice': ['This is the first choice']}),
-        #  ('1', {'id': ['941'], 'choice': ['This is the second choice']}),
-        #  ('2', {'id': [''], 'choice': ['']})]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                old_rel_obj = None
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    # Save the order, if applicable.
@@ -1678 +1770 @@
-     new_data = {}
-     obj = change and self.original_object or None
-
+self.follow
-            new_data.update(f.flatten_data(obj))
-     return new_data

django/branches/new-admin/django/views/generic/create_update.py

@@ -69 +69 @@
-                  slug_field=None, template_name=None, template_loader=template_loader,
-                  extra_lookup_kwargs={}, extra_context={}, post_save_redirect=None, 
-
+, follow=None
-    """
-    Generic object-update function.
@@ -99 +99 @@
-        raise Http404("%s.%s does not exist for %s" % (app_label, module_name, lookup_kwargs))
-    
-
+, follow=follow
-    
-    if request.POST:
-        new_data = request.POST.copy()
-        errors = manipulator.get_validation_errors(new_data)
+        manipulator.do_html2python(new_data)
-        if not errors:
-            manipulator.do_html2python(new_data)
-            manipulator.save(new_data)
-            
@@ -121 +121 @@
-        errors = {}
-        # This makes sure the form acurate represents the fields of the place.
-object.__dict__
+manipulator.flatten_data()
-    
-    form = formfields.FormWrapper(manipulator, new_data, errors)

django/branches/new-admin/docs/outputting_pdf.txt

@@ -8 +8 @@
-
-The advantage of generating PDF files dynamically is that you can create
-
+i
-pieces of content.
-

django/branches/new-admin/docs/templates_python.txt

@@ -268 +268 @@
-    from django.core.template import Context
-    import datetime
-template.
+
-        def __init__(self, *args, **kwargs):
-            Context.__init__(self, *args, **kwargs)