mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Code Issues 25 Releases Wiki Activity
11,012 Commits 28 Branches 426 Tags 667 MiB
246580573d
Commit Graph

48 Commits

Author SHA1 Message Date
Alex Gaynor
d5a45d79fe Convert all modeltests to use absolute imports, rather than relative ones. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 18:04:12 +00:00
Ramiro Morales
bf05da876a Fixed #8160 -- Made sure modelformset_factory takes in account fields' and exclude` ModelForm options. 
Thanks Andrew McMurry for the report and Claude Paroz for creating these tests.

(Actually, this had been fixed in r10619 but the tests added then exercise the
code in the context of ModelAdmin. This commit adds more generic tests.)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 20:53:39 +00:00
Jannis Leidel
24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-13 09:35:51 +00:00
Ian Kelly
9e637d3061 Fixed a number of tests that were failing in Oracle due to false assumptions about the primary keys of objects. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 00:39:35 +00:00
Ian Kelly
d9e61a435a Added a skip for a test that fails in Oracle. Unlike other backends, Oracle does not allow duplicate rows where there is a unique_together constraint for which some but not all of the columns are NULL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-08 22:41:25 +00:00
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Ramiro Morales
0b8b60caca Modified wrong expected model formset output in a couple of additional tests after fix introduced in [15424]. Refs #15167. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-05 19:21:17 +00:00
Alex Gaynor
5bc0ec4ec4 Removed all usages of deprecated TestCase methods (self.fail*). This removed most of the Warnings emitted (with -Wall) during the test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 07:28:12 +00:00
Russell Keith-Magee
9b45f6cd54 Migrated model_formsets doctests. Thanks to Gregor Müllegger for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 13:30:44 +00:00
Honza Král
67f9663f52 Fixed #13811 -- Changed unique validation in model formsets to ignore None values, not just omit them 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-13 00:30:02 +00:00
Russell Keith-Magee
d0d3e6792d Fixed #13524 -- Added backwards compatibility and feature notes regarding admin inlines and formsets. Thanks to Ramiro Morales and Gabriel Hurley. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-12 11:56:42 +00:00
Russell Keith-Magee
5211f48ae3 Fixed #12164 -- Removed the Python 2.3 compatibility imports and workarounds. Thanks to timo and claudep for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 14:00:30 +00:00
Jannis Leidel
aba95dcc0b Fixed #13023 - Removed ambiguity with regard to the max_num option of formsets and as a result of admin inlines. Thanks to Gabriel Hurley for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 23:03:56 +00:00
Luke Plant
bae921dcff Fixed #11940 - ModelForm evaluates callable default values on form class creation 
Thanks to Harm Geerts for the report and initial patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 15:03:30 +00:00
Jannis Leidel
9555f2be9d Fixed #12692 - Properly handle the extra clause of admin inline formsets. Also fixes #12703, second error. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-01 14:14:56 +00:00
Joseph Kocherhans
2f9853b2dc Fixed #12512. Changed ModelForm to stop performing model validation on fields that are not part of the form. Thanks, Honza Kral and Ivan Sagalaev. 
This reverts some admin and test changes from [12098] and also fixes #12507, #12520, #12552 and #12553.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-12 02:29:45 +00:00
Joseph Kocherhans
471596fc1a Merged soc2009/model-validation to trunk. Thanks, Honza! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-05 03:56:19 +00:00
Russell Keith-Magee
d9568af974 Tweaked the model_formsets test to work around a weird sorting problem between versions of Postgres. Thanks to Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 15:54:34 +00:00
Russell Keith-Magee
4e81086021 Cleaned up some stray text in the test from r11874. Thanks to Rob Hudson for the eagle eyes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-16 15:15:41 +00:00
Russell Keith-Magee
680268a683 Fixed #10263 -- Added a queryset argument to BaseInlineFormSet, normalizing with BaseModelFormSet, and allowing for custom ordering/subsets in inlines. Thanks to Paulo Scardine for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-16 14:52:29 +00:00
Karen Tracey
627f4623b7 Fixed #11632: Fixed a test broken by r11826 that relied on the exact (invalid HTML) id of an initial hidden input field. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 20:52:15 +00:00
Russell Keith-Magee
f259494f82 Fixed #9493 -- Corrected error handling of formsets that violate unique constraints across the component forms. Thanks to Alex Gaynor for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 12:17:52 +00:00
Jacob Kaplan-Moss
ccc8e104ee Fixed #10799: fixed the use of list_editable with model inheritance and custom one-to-one parent links. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-18 21:03:29 +00:00
Karen Tracey
bb31cf37ff Replace test use of assertTrue with failUnless. No matter how many times we try, Python 2.3 still doesn't recognize assertTrue. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-04 17:51:35 +00:00
Joseph Kocherhans
dc832d7753 Fixed some silly assumptions about pk's that broke the test suite under postgresql. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 22:16:34 +00:00
Joseph Kocherhans
15becf23a9 Forms in model formsets and inline formsets can now be deleted even if they don't validate. Related to #9587. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 19:55:20 +00:00
Joseph Kocherhans
9face54bb7 Fixed #9284. Fixed #8813. BaseModelFormSet now calls ModelForm.save(). 
This is backwards-incompatible if you were doing things to 'initial' in BaseModelFormSet.__init__, or if you relied on the internal _total_form_count or _initial_form_count attributes of BaseFormSet. Those attributes are now public methods.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-30 15:58:52 +00:00
Karen Tracey
81ae2afdec Fixed 10075: Allowed saving of inline-edited models that use multi-table inheritance. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-03 14:02:09 +00:00
Karen Tracey
ca33f07e2c Fixed #9865 -- Allow saving of new inline-edited objects with custom non-auto primary key fields that are not the foreign key to the parent object. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-21 04:56:32 +00:00
Brian Rosner
83af0b8ff3 Fixed #9494 -- Ensure the foreign key in an inline formset is always present on the forms. Thanks Fugazi for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-01 22:25:41 +00:00
Brian Rosner
0ea15f5650 Fixed #8882 -- When a foreign key is among the unique_together fields in an inline formset properly handle it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-31 22:07:05 +00:00
Brian Rosner
524a44e20b Fixed #9462 -- Set the instance in an inline formset correctly so that None does not get passed through to the queryset. Thanks tobias and copelco for the ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-28 20:01:03 +00:00
Brian Rosner
c1de41f4d2 Fixed #7973 -- Added exclude to BaseModelAdmin to make everything consistent with the form/formset factories. Refs #8071 to make it easier to get at exclude. Thanks julien for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 17:26:24 +00:00
Brian Rosner
7c7ad041b3 Fixed #7975 -- Callable defaults in inline model formsets now work correctly. Based on patch from msaelices. Thanks for your hard work msaelices. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 21:28:32 +00:00
Jacob Kaplan-Moss
ea05e61b2b Fixed #8209: ModelForms now validate unique constraints. Alex Gaynor did much of this work, and Brian Rosner helped as well. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 19:08:08 +00:00
Brian Rosner
d511996901 Enforce max_num=1 on inline model formsets that have a unique foreign key to its parent. I snuck in a quick clean up to the inlineformset_factory as well. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 21:14:46 +00:00
Brian Rosner
27f9b96fa0 Fixed handling of primary keys in model formsets. Model formsets should now work nicely with custom primary keys that are OneToOneField, ForeignKey and AutoField. Added tests to handle each of them. 
Fixes #8241, #8694, #8695 and #8719.

Thanks Karen Tracey, jonloyens, sciyoshi, semenov and magneto for tracking down various parts of this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 09:49:55 +00:00
Brian Rosner
d57d490b76 Fixed #7918 -- Allow the foreign key in an inline to be any where in the parent chain. Thanks sil for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:41:40 +00:00
Malcolm Tredinnick
d5f1d6f937 Fixed #8542 -- Made the model_formstests tests from [8528] a little less 
dependent upon the precise values of auto-created primary key integers.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 23:56:39 +00:00
Brian Rosner
82a1d5471c Fixed #7888 -- Handle model inheritance with model formsets correctly. Thanks bpeschier for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 03:51:25 +00:00
Brian Rosner
af35fb1fbb Ensure that custom primary keys are always shown on a formset. Refs #7938. Thanks magneto for discovering this problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-01 20:35:40 +00:00
Brian Rosner
61b335700c Fixed #8067 -- Replaced dict literals in the model_formsets tests with sorted lists of tuples to ensure compatibilty on different implementations of Python. Thanks Leo Soto for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-01 20:12:18 +00:00
Malcolm Tredinnick
aee55ce524 Changed one of the model_formsets tests to be immune to the differences in the 
natural collation ordering used by different databases (normally, this test
would fail on PostgreSQL, but not because the code was incorrect). This is
purely a test tweak.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 01:18:18 +00:00
Russell Keith-Magee
eca3c7d3d6 Added an ordering definition to make test output reliable across database backends. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 14:49:39 +00:00
Brian Rosner
3912403550 Added the ability to customize the prefix value on an inline formset. Fixes #7899. AThanks for the tip Peter of the Norse. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 04:46:31 +00:00
Brian Rosner
9d8f41baac Made the semi-private _max_form_count live on the public API of formsets by renaming it to max_num. This also removes the ManagementForm use of MAX_COUNT since that usage should just be referenced to the formset's max_num property. Refs #7899. Thanks Peter of the Norse for straightening me out. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 04:28:52 +00:00
Jacob Kaplan-Moss
46786b4193 Fixed #7741: django.newforms is now django.forms. This is obviously a backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 01:22:26 +00:00
Brian Rosner
a19ed8aea3 Merged the newforms-admin branch into trunk. 
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 23:54:34 +00:00