Commit Graph

5521 Commits

Author SHA1 Message Date
Andrew Godwin 7e708a2536 [1.7.x] Fixed #22944: Bad dependency on FK alteration in autodetector 2014-07-26 09:22:31 -07:00
qingfeng 3a2badcbb7 [1.7.x] Fixed #23060 -- Prevented UnicodeDecodeError in debug templatetag
Backport of 08451f17d0 from master.
2014-07-26 18:04:01 +02:00
Hiroki KIYOHARA df678b7500 [1.7.x] Fixed code to solve #23070 problem
Added a class to wrap callable in settings:
* Not to call in the debug page (#21345).
* Not to break the debug page if the callable forbidding to set attributes (#23070).

Thanks @bmispelon for giving me some advice.

Backport of d0889863de from master.
2014-07-26 14:53:31 +02:00
Hiroki KIYOHARA 0d8d4fe9b4 [1.7.x] Added test for the #23070 problem
Backport of e569144910 from master.
2014-07-26 14:48:25 +02:00
Tim Graham d1c08d4758 [1.7.x] Fixed bad usage of rstrip() that caused test failure.
If the temporary file name contained a p or y as its last
characters, it would be stripped. refs #23083.

Backport of 57d2b3f2a7 from master
2014-07-25 15:17:18 -04:00
Tim Graham 4f8a5bd8d0 [1.7.x] Fixed #23083 -- Fixed runserver reloading when deleting a file.
Thanks Collin Anderson for the report and hirokiky for the fix.

Backport of b8cb5ba708 from master
2014-07-25 13:25:16 -04:00
Andrew Godwin 919d10e619 [1.7.x] Fixed #23093: soft application detection for swapped models 2014-07-25 09:35:53 -07:00
Jeroen Dekkers 6e7e5bacd5 [1.7.x] Fixed #23071 -- Use last migration's name in dependency to other app
Changed the autodetector to lookup the name of the other app's last
migration in the graph and use that as dependency instead of using
__latest__.
2014-07-25 08:54:54 -07:00
Moayad Mardini ce95ab8f02 [1.7.x] Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`.
Backport of 6508db2ff9 from master
2014-07-25 06:16:55 -04:00
Aymeric Augustin 2a97db33a7 [1.7.x] Avoided transactional DDL on castrated databases.
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308 and #23089.

Backport of 0757e0f30d from master
2014-07-24 18:48:05 -04:00
Aymeric Augustin 5ca82ff71b [1.7.x] Fixed #23089 -- Fixed transaction handling in two management commands.
Previously, when createcachetable and flush operated on non-default
databases, they weren't atomic.

Backport of 753a22a635 from master
2014-07-24 18:13:12 -04:00
Tim Graham b918bc921c [1.7.x] Fixed #23014 -- Infinite migration regression with unique/index_together.
Backport of 64e75c47ef from master
2014-07-24 14:30:16 -04:00
Tim Graham 0f8e8c86dd [1.7.x] Silenced test warning for deprecated IPAddressField.
Backport of 99cd80dc74 from master
2014-07-24 11:40:49 -04:00
Tim Graham c86b9d1985 [1.7.x] Silenced a Python 2 ImportWarning in a migrations test.
Backport of 66211b4b75 from master
2014-07-24 09:29:45 -04:00
Tim Graham 7cbb4f79d1 [1.7.x] Improved patching of sys.stdout in refs #23078.
Backport of 936fba5878 from master
2014-07-24 08:47:24 -04:00
Nick Sandford 9638daec5c [1.7.x] Fixed #23078 -- Regression in update_contenttypes() interactivity.
Thanks raymond at adaptiv.nl for the report.

Backport of fa3cf006b2 from master
2014-07-23 08:49:55 -04:00
Andrew Godwin e2220c1c08 [1.7.x] Fixed #23014: Renaming not atomic with unique together 2014-07-21 11:37:10 +01:00
Andrew Godwin 88135a8cf7 [1.7.x] Fixed #23009: Shorten FK identifiers in add_field and make consistent 2014-07-21 10:50:58 +01:00
Andrew Godwin f57e84392e [1.7.x] Fixed #22975: Don't call rename SQL if not needed 2014-07-21 10:14:34 +01:00
Andrew Godwin ff8d715a0a [1.7.x] Fixed #23039: Don't try to serialize unmanaged models in tests 2014-07-21 10:09:58 +01:00
Andrew Godwin de709001c4 [1.7.x] Fixed #23041: Bad base dependencies for proxy models 2014-07-16 09:59:37 -07:00
Tim Graham 3552afa25e [1.7.x] Added Chrome/IE support for a selenium test.
Backport of 5954aa6db0 from master
2014-07-16 10:54:38 -04:00
Claude Paroz 15feb1d8e8 [1.7.x] Added forgotten files from commit 28efafa24c
Backport of c5d8e4a0d1 from master.
2014-07-16 14:30:43 +02:00
Anssi Kääriäinen f8a2a5604b [1.7.x] PEP8 cleanup
Backport of f8df55050c from master
2014-07-16 12:50:01 +03:00
Gavin Wahl 72419ca8da [1.7.x] Fixed #22998 -- Updated the fast_delete logic for GFKs
Backport of 6e2b82fdf6 from master
2014-07-16 12:43:14 +03:00
Claude Paroz d6f293ad1b [1.7.x] Ignored STATIC_ROOT and MEDIA_ROOT in makemessages
Also alleviate issues with weird file names typically found in
MEDIA_ROOT directories (#23010).
Thanks Tim Graham for the review.
Backport of 28efafa24c from master.
2014-07-16 09:43:50 +02:00
Tim Graham 01515ebaa4 [1.7.x] Fixed #23013 -- Fixed removing unique_together/index_together constraints in migrations.
Thanks melinath for the report.

Backport of 0154965392 from master
2014-07-15 15:21:44 -04:00
Tim Graham fe5f29eb1d [1.7.x] Fixed #23008 -- Fixed typo causing bad migration dependencies.
Thanks semenov for the report and Florian for investigation.

Backport of 9a2ab62977 from master
2014-07-15 08:51:16 -04:00
Claude Paroz f2011e21a2 [1.7.x] Fixed #22991 -- Prevented *.pyc files in autoreload monitoring
This fixes a regression introduced in 6d302f639.
Thanks lorinkoz at gmail.com for the report, Collin Anderson
for the initial patch and Simon Charette for the review.
Backport of 4e424084e from master.
2014-07-15 09:59:25 +02:00
Huu Nguyen 6d5238f6c8 [1.7.x] Fixed #22791 -- Invoke interactive questioner only for conflicts in specified apps.
Thanks bendavis78 for the report and Tim Graham for the review.

Backport of f7a78f9bba from master
2014-07-14 13:00:45 -04:00
Anssi Kääriäinen 4b53bfff37 [1.7.x] Fixed #22992 -- regression in .filter(generic_fk=...) error message
Generic Foreign Keys can't be used as lhs in lookups for historical
reasons. Django 1.6 gave a FieldDoesNotExist exception when using GFKs
as lhs in lookups, but due to regression caused by lookup refactor patch
(20bab2cf9d) the exception type was
changed to AttributeError.

It might be a good idea to add support for gfk__exact and gfk__in lookups
later on.

Thanks to glicerinu@gmail.com for the report. The code in this commit
was written by Tim Graham.

Backport of efe87d3e48 from master
2014-07-14 12:55:05 -04:00
Anssi Kääriäinen 572885729e [1.7.x] Fixed #22994 -- regression with generic FK + admin list_view
The reason for the regression was that the GenericForeignKey field isn't
something meta.get_field_by_name() should return. The reason is that a
couple of places in Django expects get_field_by_name() to work this way.
It could make sense to return GFKs from get_field_by_name(), but that
should likely be done as part of meta refactoring or virtual fields
refactoring patches.

Thanks to glicerinu@gmail.com for the report and to Tim for working on
the issue.
2014-07-14 12:51:24 -04:00
Claude Paroz be38c5bcc8 [1.7.x] Fixed #22939 -- Delayed admin_static backend detection
Thanks generalov for the report.

Backport of 22b2fb0b from master
2014-07-12 18:50:32 +02:00
Tim Graham 736e289445 [1.7.x] Fixed #13794 -- Fixed to_field usage in BaseInlineFormSet.
Thanks sebastien at clarisys.fr for the report and gautier
for the patch.

Backport of 5e2c4a4bd1 from master
2014-07-10 17:36:04 -04:00
Andrew Godwin eb7e232e7f [1.7.x] Fix comment 2014-07-10 10:01:12 -07:00
Andrew Godwin aba75e73db [1.7.x] Fixed #22970: Incorrect dependencies for existing migrated apps 2014-07-09 23:53:53 -07:00
Daniel Pyrathon 2100bcef41 [1.7.x] Added a unit test to ensure models cannot be ordered by a M2M field.
Backport of 865bc71783 from master
2014-07-08 09:20:15 -04:00
Tim Graham 1318254669 [1.7.x] Renamed an admin_views test to fix ordering issue.
test_i18n_language_non_english_fallback fails if run after
test_L10N_deactivated; the tests can be run in any order after
a5f6cbce07 but this commit is not
in stable/1.7.x.
2014-07-07 19:56:22 -04:00
Tim Graham 1326cd28d0 [1.7.x] Removed unnecessary directory in dispatch tests.
Backport of 136a3ffe21 from master
2014-07-07 19:22:20 -04:00
Tim Graham 0100afb013 [1.7.x] Fixed flake8 errors.
Backport of fddd95254e from master
2014-07-07 19:13:00 -04:00
Tim Graham 28962c57f3 [1.7.x] Fixed #22909 -- Removed camelCasing in some tests.
Thanks brylie.

Backport of 89b9e6e5d6 from master
2014-07-07 19:10:48 -04:00
Claude Paroz 1bb8ccdb9e [1.7.x] Fixed pyinotify performance regression in 15f82c7011
Refs #9722. Thanks Tim Graham for the review.
Backport of 6d302f639 from master.
2014-07-06 21:45:09 +02:00
Loic Bistuer a1ddfe4401 [1.7.x] Fixed #22906 -- Added a more helpful repr to migrations' ModelState.
Thanks Collin Anderson for the report and original patch.

Backport of 2572c07cc6 from master
2014-07-06 15:00:03 +07:00
Tim Graham 4b30bddb7a [1.7.x] Updated tests per previous commit.
Backport of 86c74eacd6 from master
2014-07-05 20:20:55 -04:00
Simon Charette 2f0cc4f5fb [1.7.x] Fixed #22943 -- Correctly serialize compiled regexes.
Thanks to antialiasis at gmail dot com for the patch.
2014-07-05 16:38:34 -07:00
Andrew Godwin 1f889800d6 [1.7.x] Fixed #22960: Bad handling of relations as PKs in autodetector 2014-07-05 16:33:34 -07:00
Claude Paroz 83a185a3f7 [1.7.x] Ensured bound field renders as unicode safe data
Refs #22950.
Backport of 920904921 from master.
2014-07-05 13:35:53 +02:00
Loic Bistuer b68c7a5abb [1.7.x] Fixed #22915 -- Document backward incompatible changes in the ValidationError constructor.
This patch also fixes update_error_dict to better handle the use case described
in this ticket, previously the type of the provided container could be lost in
some conditions.

Thanks Russell Keith-Magee for the report and Tim Graham for review.

Backport of eb7df6b8d7 from master
2014-07-04 17:19:12 +07:00
Colin Wood f5740af868 [1.7.x] Fixed #22940 -- Added missing string iterpolation parameters in migrations.writer error. 2014-07-02 12:44:10 -04:00
Tim Graham 43d7566cc9 [1.7.x] Added spaces to message from 4c39c270af.
Backport of add78c58b5 from master
2014-06-30 07:41:47 -04:00