Django

Code

Show
Ignore:
Timestamp:
04/27/08 06:49:03 (9 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7478]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7435 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7477

  • django/branches/newforms-admin/django/contrib/contenttypes/generic.py

    r7436 r7479  
    155155        return "ManyToManyField" 
    156156 
     157    def db_type(self): 
     158        # Since we're simulating a ManyToManyField, in effect, best return the 
     159        # same db_type as well. 
     160        return None 
     161 
    157162class ReverseGenericRelatedObjectsDescriptor(object): 
    158163    """