Commit 14fa7f99 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #14102 -- Ensure that fields that have been excluded from a form... 

[1.2.X] Fixed #14102 -- Ensure that fields that have been excluded from a form aren't included in the unique_for_* checks, either. Thanks to Travis Cline for the report and fix.

Backport of r13598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1e3ed71c

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ answer newbie questions, and generally made Django that much better: 
    Michal Chruszcz <troll@pld-linux.org>

    Can Burak Çilingir <canburak@cs.bilgi.edu.tr>

    Ian Clelland <clelland@gmail.com>

    Travis Cline <travis.cline@gmail.com>

    Russell Cloran <russell@rucus.net>

    colin@owlfish.com

    crankycoder@gmail.com

django/db/models/base.py

+4 −5
Original line number Diff line number Diff line 
import types

import sys

import os

from itertools import izip

import django.db.models.manager     # Imported to register signal handler.

from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError, ValidationError, NON_FIELD_ERRORS
@@ -16,7 +15,7 @@ from django.db.models.loading import register_models, get_model 
from django.utils.translation import ugettext_lazy as _

import django.utils.copycompat as copy

from django.utils.functional import curry, update_wrapper

from django.utils.encoding import smart_str, force_unicode, smart_unicode

from django.utils.encoding import smart_str, force_unicode

from django.utils.text import get_text_list, capfirst

from django.conf import settings
@@ -744,11 +743,11 @@ class Model(object): 
                    continue

                if f.unique:

                    unique_checks.append((model_class, (name,)))

                if f.unique_for_date:

                if f.unique_for_date and f.unique_for_date not in exclude:

                    date_checks.append((model_class, 'date', name, f.unique_for_date))

                if f.unique_for_year:

                if f.unique_for_year and f.unique_for_year not in exclude:

                    date_checks.append((model_class, 'year', name, f.unique_for_year))

                if f.unique_for_month:

                if f.unique_for_month and f.unique_for_month not in exclude:

                    date_checks.append((model_class, 'month', name, f.unique_for_month))

        return unique_checks, date_checks

tests/modeltests/model_forms/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -156,6 +156,10 @@ class UniqueTest(TestCase): 
        form = PostForm({'subtitle': "Finally", "title": "Django 1.0 is released",

            "slug": "Django 1.0", 'posted': '2008-09-03'}, instance=p)

        self.assertTrue(form.is_valid())

        form = PostForm({'title': "Django 1.0 is released"})

        self.assertFalse(form.is_valid())

        self.assertEqual(len(form.errors), 1)

        self.assertEqual(form.errors['posted'], [u'This field is required.'])



    def test_inherited_unique_for_date(self):

        p = Post.objects.create(title="Django 1.0 is released",

tests/modeltests/validation/test_unique.py

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ class GetUniqueCheckTests(unittest.TestCase): 
            ), m._get_unique_checks()

        )



    def test_unique_for_date_exclusion(self):

        m = UniqueForDateModel()

        self.assertEqual((

            [(UniqueForDateModel, ('id',))],

            [(UniqueForDateModel, 'year', 'count', 'end_date'),

             (UniqueForDateModel, 'month', 'order', 'end_date')]

            ), m._get_unique_checks(exclude='start_date')

        )



class PerformUniqueChecksTest(unittest.TestCase):

    def setUp(self):

        # Set debug to True to gain access to connection.queries.