Commit Graph

18404 Commits

Author SHA1 Message Date
Luke Plant 8e3c3be32d [1.7.x] Fixed bug in circular dependency algo for migration dependencies.
Previous algo only worked if the first item was a part of the loop,
and you would get an infinite loop otherwise (see test).

To fix this, it was much easier to do a pre-pass.

A bonus is that you now get an error message that actually helps you debug
the dependency problem.

Backport of ff3d746e8d from master, with
additional tests from c5def493d0
2014-11-26 08:15:33 +00:00
Simon Charette 2a20bccda9 [1.7.x] Fixed #23754 -- Always allowed reference to the primary key in the admin
This change allows dynamically created inlines "Add related" button to work
correcly as long as their associated foreign key is pointing to the primary
key of the related model.

Thanks to amorce for the report, Julien Phalip for the initial patch,
and Collin Anderson for the review.

Backport of f9c4e14aec from master
2014-11-25 13:32:24 -05:00
Simon Charette f46ebc680b [1.7.x] Added warning about get_inline_instances() permission checking; refs #23754.
Backport of e0d1f2684a from master
2014-11-25 13:15:02 -05:00
Redouane Zait f671905fdb [1.7.x] Fixed #23898 -- Added missing context to admin's deleted_selected view.
Backport of 8e7b384d89 from master
2014-11-25 11:27:30 -05:00
Richard Olsson 3350531ceb [1.7.x] Fixed typo in docs/ref/django-admin.txt
Backport of c1552af1fe from master
2014-11-25 07:51:58 -05:00
Tim Graham 299e7718cf [1.7.x] Fixed #23907 -- Added admin.site.register in tutorial 2 for consistency.
Backport of 1dbdc03382 from master
2014-11-24 15:59:43 -05:00
Sergey Fedoseev 78fe7ec14f [1.7.x] Fixed #23888 -- Fixed crash in File.__repr__() when name contains unicode.
Backport of 1e9ac504e4 from master
2014-11-24 15:55:43 -05:00
Tom V 014f699c8b [1.7.x] Fixed typo in django/utils/decorators.py comment.
Backport of d049b36f91 from master
2014-11-24 10:46:28 -05:00
Luke Plant 9d0e61f04d [1.7.x] Further fixes to the migration notes for get_query_set
This rename is very tricky for the case of subclasses which define
get_query_set and haven't been updated yet, which applies to all projects in
the form of RelatedManager from Django 1.5.

Backport of 0c623da664 from master
2014-11-24 15:35:31 +00:00
Danilo Bargen 60cf46fdf5 [1.7.x] Fixed #23543 -- Added docs on testing management command output.
Backport of cdee865976 from master
2014-11-24 10:29:14 -05:00
Luke Plant e10c5a8fdd [1.7.x] Better migration docs for get_query_set -> get_queryset
This way they won't need to fix things again when get_query_set disappears

Backport of 91e2780dfb from master
2014-11-24 10:17:27 +00:00
Kevin Ndung'u 22d292e23b [1.7.x] Fixed #23900 -- Added missing imports in code example.
The Preventing header injection example included
classes that are not imported.

Thanks to Collin Anderson and Berker Peksağ for the
reviews.

Backport of 0d74209ef6 from master.
2014-11-23 23:08:13 +01:00
Carl Meyer 2d06c112d1 Revert "[1.7.x] Fixed #23892 -- Made deconstructible classes forwards compatible"
This reverts commit 8014001d92.

Adding kwargs to deconstructed objects does not achieve useful
forward-compatibility in general, since the additional kwargs are silently
dropped rather than having their expected effect. In fact, it can cause the
failure to be more difficult to debug. Thanks Shai Berger for discussion.
2014-11-22 22:26:58 -07:00
Carl Meyer 8014001d92 [1.7.x] Fixed #23892 -- Made deconstructible classes forwards compatible
Backport of f36151ed16 from master.
2014-11-22 14:33:46 -07:00
Claude Paroz 4592059484 [1.7.x] Updated an old note about GEOSGeometry.transform
Backport of b0a58b9085 from master.
2014-11-22 13:26:49 +01:00
Simon Charette cc5aa809e2 [1.7.x] Fixed typo in forms/models.py comment.
Backport of a7c3d0f288 from master
2014-11-21 15:59:54 -05:00
Stanislas Guerra 4ea39230fc [1.7.x] Fixed #23778 -- Added a doc section on using the Django runner for reusable apps.
Backport of 06726965c3 from master.
2014-11-21 13:07:45 -07:00
Alasdair Nicol f91c6ecc22 [1.7.x] Fixed #23865 -- documented how to assign errors to a field in Model.clean()
Also added a unit test wit the simpler syntax which we have documented,
where the dictionary values are strings.

Backport of 5b26a014a8 from master
2014-11-21 13:02:40 -05:00
Tom V 910dcd574a [1.7.x] Fixed typo in docs/internals/release-process.txt.
Backport of a3aeba0f95 from master
2014-11-21 11:49:48 -05:00
Andrzej Pragacz feded19104 [1.7.x] Fixed #23794 -- Fixed migrations crash when removing a field that's part of index/unique_together.
Backport of 72729f844e from master
2014-11-21 10:57:38 -05:00
Markus Holtermann 145467a636 [1.7.x] Fixed duplicate index error on Oracle; refs #23859.
Refers to regression introduced in 7b4a994599

Backport of 4c709cc0ef from master
2014-11-20 14:44:05 -05:00
Anssi Kääriäinen 01f2cf2aec [1.7.x] Fixed #23605 -- Fixed nested subquery regression
Added relabeled_clone() method to sql.Query to fix the problem. It
manifested itself in rare cases where at least double nested subquery's
filter condition might target non-existing alias.

Thanks to Trac alias ris for reporting the problem.

Backport of 5c481db295 from master
2014-11-20 13:53:28 -05:00
Alasdair Nicol 2e2607870d [1.7.x] Added missing backticks to form validation docs
Backport of 38ab0f13fa from master
2014-11-20 11:09:57 -05:00
Michal Petrucha 593353d8af [1.7.x] Fixed #23817 -- Updated docs on QuerySet evaluation
Removed inaccurate info about partial evaluation after refs #18702.
Added information on modifying sliced QuerySets; refs #22503.

Backport of 327df551e8 from master
2014-11-20 09:35:29 -05:00
Markus Holtermann 1b8c067a4f [1.7.x] Cleaned up and reformatted autodetector tests
Backport of 2331650835 from master.
2014-11-19 18:25:00 -05:00
Markus Holtermann 2f8cd09a06 [1.7.x] Formatted model states in autodetector tests
Backport of f17acd5930 from master.
2014-11-19 18:25:00 -05:00
Carl Meyer 03e8c18288 [1.7.x] Fixed #23410 -- Avoided unnecessary rollbacks in related apps when migrating backwards.
Backport of ab2819aa7b from master.
2014-11-19 16:15:05 -07:00
Carl Meyer ac359dc771 [1.7.x] Fixed #21794 -- Removed deprecation warning for abstract models outside an app.
Backport of e7b9a58b08 from master.
2014-11-19 15:56:25 -07:00
Stratos Moros 50434aebe2 [1.7.x] Fixed #22248 -- Made RenameModel reversible
Backport of cf7a2a000e from master
2014-11-19 09:51:07 -05:00
Tillmann Karras dfcac7d7f5 [1.7.x] Fixed #23799 -- Made makemigrations respect --no-optimize.
Thanks to yamila-moreno for the idea of a skip message.

Backport of d188101319 from master
2014-11-18 09:20:04 +01:00
Carl Meyer 229abe62fa [1.7.x] Fix malformed note directive. 2014-11-17 16:43:25 -07:00
Markus Holtermann 03d983f7c3 [1.7.x] Fixed #23859 -- Fixed a migration crash when a field is renamed that is part of an index_together
Backport of 7b4a994599 from master.
2014-11-17 15:57:19 -07:00
twidi 49d4095767 [1.7.x] Avoided unneeded calls to state.render() in migrations.
Backport of 19ae13d9ed from master
2014-11-17 18:45:21 +01:00
twidi 4fbeec5631 [1.7.x] Reordered condition to avoid calling allow_migrate() if unneeded.
Backport of 82aca216e1 from master
2014-11-17 18:34:36 +01:00
Tim Graham 5a6d6c5e0b [1.7.x] Fixed #23855 -- Removed unnecessary all() in tutorial 3.
Backport of 8fce797830 from master
2014-11-17 18:12:19 +01:00
nmundar b2534bfa7b [1.7.x] Fixed #23690 - fixed examples of manual rendering of form fields
Documentation for rendering form fields manually is now updated to use fields id_for_label instead of hardcoded values with additional mention of label_tag for alternative generation of complete label tag.

Backport of 48515ee1f7 from master
2014-11-16 14:36:08 +01:00
Peter Sagerson 42001e027c [1.7.x] Fixes a race condition in the documentation.
The example for django.contrib.admin.ModelAdmin.get_form modifies
self.exclude. However, since ModelAdmin instances are global and have no
thread- or request-locality, this is not safe for concurrent
requests.[1] This updated documentation demonstrates a safe method to
override admin forms on a per-request basis.

[1] https://groups.google.com/forum/#!topic/django-users/AmoUDtEefyA

Backport of 0d1a9d203a from master
2014-11-16 14:33:14 +01:00
Andreas Madsack 7796f62c36 [1.7.x] Fixed #23808 -- Documented that migrations table is created when using runserver without migrating first.
Backport of 27c9b3a27d from master
2014-11-15 20:06:13 +01:00
Erik Romijn d49c42e20e [1.7.x] Fixed #23793 -- Clarified password reset behavior in auth docs
Backport of c5132382f0 from master.
2014-11-15 17:44:29 +01:00
Berker Peksag 3c2507c386 [1.7.x] Fixed #23665 -- Noted precedence of settings.USE_L10N in MONTH_DAY_FORMAT and YEAR_MONTH.
Backport of 4f90c99635 from master
2014-11-15 09:55:31 +01:00
Tim Graham b050dc46a9 [1.7.x] Fixed #23588 -- Added a link in tutorial for list_display options.
Backport of 3a550bb6d3 from master
2014-11-13 20:16:29 +01:00
Tim Graham cf5e2c46f2 [1.7.x] Fixed #23802 -- Typos in 1.7 release notes.
Backport of d5a109f6e6 from master
2014-11-13 20:10:40 +01:00
Tim Graham 1a73d6394e [1.7.x] Added missing docs for 1_7.W001 check.
Backport of 098368d82f from master
2014-11-13 20:09:51 +01:00
Claude Paroz 99ae86d1d4 [1.7.x] Updated Fink doc section to be version-agnostic
Backport of 7fd1f3a645 from master.
2014-11-13 14:35:57 +01:00
Tim Graham 4f5614d68e [1.7.x] Removed thread customizations of six which are now built-in.
Backport of 7ef81b5cdd from master
2014-11-13 11:34:03 +01:00
Adam DePue 2d12a59938 [1.7.x] Fixed #23761 -- Fixed crash with MySQL validator and db_type is None.
The issue was fixed on master in e9103402c0.
2014-11-13 11:03:01 +01:00
Tim Graham d4bec655ae [1.7.x] Fixed flake8 warning.
Backport of dec7da3c4c from master
2014-11-13 10:08:17 +01:00
Baptiste Mispelon 606c57a132 [1.7.x] Fixed #23795 -- Fixed a regression in custom form fields
Custom form fields having a `queryset` attribute but no
`limit_choices_to` could no longer be used in ModelForms.

Refs #2445.

Thanks to artscoop for the report.

Backport of bfb11b9562 from master.

Conflicts:
	django/forms/fields.py
2014-11-12 22:46:00 +01:00
Tim Graham 3e0d7de8a6 [1.7.x] Fixed #23774 -- Clarified QuerySet.order_by() and related models.
Backport of 11b7680d0e from master
2014-11-12 22:01:07 +01:00
aruseni 7c44d4be34 [1.7.x] Fix a typo in 1.7 release notes
Backport of faf4d5c510 from master
2014-11-10 20:02:26 -05:00