Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #7682 -- Added a work around to keep existing admin alive until

newforms-admin merges (to handle changes in [7790]).

This code becomes irrelevant in a non-oldforms world, so even if it's not quite
correct, it will do for now. Based on a patch from puyb@puyb.net and Karen
Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1e00458521b81bc86883ce938ea689b799bfd928 1 parent e18fccc
Malcolm Tredinnick authored July 11, 2008

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  django/db/models/fields/__init__.py
2  django/db/models/fields/__init__.py
@@ -326,7 +326,7 @@ def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=
326 326
             params['validator_list'].append(getattr(manipulator, 'isUnique%sFor%s' % (self.name, self.unique_for_month)))
327 327
         if self.unique_for_year:
328 328
             params['validator_list'].append(getattr(manipulator, 'isUnique%sFor%s' % (self.name, self.unique_for_year)))
329  
-        if self.unique or (self.primary_key and not rel):
  329
+        if self.unique and not rel:
330 330
             params['validator_list'].append(curry(manipulator_validator_unique, self, opts, manipulator))
331 331
 
332 332
         # Only add is_required=True if the field cannot be blank. Primary keys

0 notes on commit 1e00458

Please sign in to comment.
Something went wrong with that request. Please try again.