Commit Graph

12280 Commits

Author SHA1 Message Date
Marco Fucci 0e2d3b9304 [1.8.x] Fixed #24505 -- Fixed clash with hidden m2m fields.
Added support for multiple m2m fields with the same 'to' model
and with related_name set to '+'.

Backport of 4ee08958f1 from master
2015-09-30 18:38:49 -04:00
Mariusz Felisiak cb2de5e2e9 [1.8.x] Fixed #25421 -- Fixed test --keepdb option on Oracle.
Backport of a3a6def867 from master
2015-09-26 19:52:09 -04:00
Benjamin Wohlwend 67896c8561 [1.8.x] Fixed #25453 -- Reworded makemigration's ask_not_null_alteration suggestion.
Backport of de31423130 from master
2015-09-23 13:41:01 -04:00
Aymeric Augustin 425c5e40ea [1.8.x] Fixed #24921 -- set_autocommit(False) + ORM queries.
This commits lifts the restriction that the outermost atomic block must
be declared with savepoint=False. This restriction was overly cautious.

The logic that makes it safe not to create savepoints for inner blocks
also applies to the outermost block when autocommit is disabled and a
transaction is already active.

This makes it possible to use the ORM after set_autocommit(False).
Previously it didn't work because ORM write operations are protected
with atomic(savepoint=False).

Backport of 91e9f1c from master
2015-09-21 22:31:13 +02:00
Claude Paroz 158b0a2837 [1.8.x] Fixed #25431 -- Readded inline foreign keys to modelformset instances
Too much field exclusions in form's construct_instance() in _post_clean()
could lead to some unexpected missing ForeignKey values.
Fixes a regression from 45e049937. Refs #13776.

Backport of 65a1055a3 from master.
2015-09-21 21:50:11 +02:00
Matt Deacalion Stevens 5023d63f85 [1.8.x] Corrected docstring in core.urlresolvers module.
The RegexURLResolver.resolve() method no longer returns a tuple.
It has returned a ResolverMatch object since commit e0fb90b2.

Backport of c07f9fef39 from master
2015-09-21 14:00:31 -04:00
Aymeric Augustin 1abd177696 [1.8.x] Fixed #25160 (again) -- Moved data loss check on reverse relations.
Moved data loss check when assigning to a reverse one-to-one relation on
an unsaved instance to Model.save(). This is exactly the same change as
e4b813c but for reverse relations.

Backport of c3904de from master
2015-09-19 20:28:22 +02:00
Hynek Cernoch eb0bbb8f3a [1.8.x] Refs #17785 -- Made docstring for sqlite3's get_relations() consistent with other backends.
Backport of 4b9d063da0 from master
2015-09-18 09:33:23 -04:00
Aric Coady 7d471fe662 [1.8.x] Refs #20625 -- Fixed custom queryset chaining with values() and values_list(). 2015-09-17 19:20:09 -04:00
Matthew Crowson 688f8de7b6 [1.8.x] Fixed typo in django/core/cache/backends/base.py docstring.
Backport of 8615e41586 from master
2015-09-16 09:35:14 -04:00
Daniel Hahler e3bdbac733 [1.8.x] Added upgrade tip in BaseCommand.option_list deprecation comment.
Backport of d731cf5caf from master
2015-09-15 12:08:09 -04:00
Adam Chainz 3c2c74f58f [1.8.x] Fixed #25377 -- Changed Count queries to execute COUNT(*) instead of COUNT('*').
Backport of 3fe3887a2e from master
2015-09-14 14:07:32 -04:00
Ville Skyttä 69017bade0 [1.8.x] Fixed #25393 -- Fixed MySQL crash when adding text/blob field with unhashable default.
Backport of 4d933ad418 from master
2015-09-14 12:28:04 -04:00
Kholid Fuadi 07e01dce40 [1.8.x] Fixed typo in django/forms/utils.py docstring.
Backport of b8b776aabe from master
2015-09-14 08:50:15 -04:00
Markus Holtermann 3cc5cc7958 [1.8.x] Fixed #25384 -- Ordered imports in newly created migration files 2015-09-12 13:23:38 +10:00
Daniel Hahler 6c19d81951 [1.8.x] Fixed #25372 -- Fixed autocompletion for options of non-argparse commands.
Backport of acb833081d from master
2015-09-09 14:52:33 -04:00
Aymeric Augustin ce3dd17c2e [1.8.x] Updated references to the TEST_* database settings.
They were removed in Django 1.9.

I could leave the reference to TEST_DEPENDENCIES in the 1.2.4 release
notes because the link points to the right location and the name was
accurate at the time.

Backport of 6d1110f from master
2015-09-05 20:31:22 +02:00
Tim Graham 62347208bb [1.8.x] Fixed #24525 -- Fixed AssertionError in some complex queries.
Thanks Anssi Kääriäinen for providing the solution.

Backport of 2dc9ec5616 from master
2015-09-05 08:19:38 -04:00
Maxime Lorant 7dabaa8ee3 [1.8.x] Refs #25345 -- Updated links to code.google.com.
Backport of c92cd22d02 from master
2015-09-04 08:18:22 -04:00
Aymeric Augustin 2b08b36488 [1.8.x] Made the autoreloader survive all exceptions.
Refs #24704.

Backport of b79fc11d73 from master
2015-08-29 23:13:12 +02:00
Aymeric Augustin cc14d51ee8 Fixed #24704 -- Made the autoreloader survive SyntaxErrors.
With this change, it's expected to survive anything except errors
that make it impossible to import the settings. It's too complex
to fallback to a sensible behavior with a broken settings module.

Harcoding things about runserver in ManagementUtility.execute is
atrocious but it's the only way out of the chicken'n'egg problem:
the current implementation of the autoreloader primarily watches
imported Python modules -- and then a few other things that were
bolted on top of this design -- but we want it to kick in even if
the project contains import-time errors and django.setup() fails.

At some point we should throw away this code and replace it by an
off-the-shelf autoreloader that watches the working directory and
re-runs `django-admin runserver` whenever something changes.

Backport of fe6ddb837d from master
2015-08-29 23:12:08 +02:00
Aymeric Augustin dc8786ce94 [1.8.x] Ensured gen_filenames() yields native strings.
This also fixes a test failure on Python 2 when Django is installed in a
non-ASCII path. This problem cannot happen on Python 3.

Backport of c2fcba2ac7 from master
2015-08-29 23:10:55 +02:00
Aymeric Augustin b18bb65fd2 [1.8.x] Accounted for error files in the autoreloader.
* When some old files contain errors, the second call to
  gen_filenames() should return them.
* When some new files contain errors, the first call to
  gen_filenames(only_new=True) should return them.

Backport of 23620cb8e0 from master
2015-08-29 23:08:06 +02:00
Tim Graham 0d368bfb47 [1.8.x] Fixed #25323 -- Fixed selenium test failures with chromedriver 2.18.
Backport of 7ac0cd445e from master
2015-08-28 14:38:18 -04:00
Tim Graham 3cc67a637a [1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor.
Backport of 9607a04041 from master
2015-08-28 09:03:34 -04:00
Claude Paroz c177d0690e [1.8.x] Fixed #25295 -- Restored 'no active translation' after language override
Thanks David Nelson Adamec for the report and Tim Graham for the review.
Backport of 9324935c3 from master.
2015-08-25 10:37:54 +02:00
Kai Richard Koenig 181528726e [1.8.x] Fixed #25040 -- Fixed migrations state crash with GenericForeignKey
Backport of 60f795c060 from master
2015-08-22 08:50:19 -04:00
Tim Graham ffe755e990 [1.8.x] Fixed #24951 -- Fixed AssertionError in delete queries involving a foreign/primary key.
Thanks Anssi Kääriäinen for help.

Backport of 333cbdcd2d from master
2015-08-20 08:46:08 -04:00
Tim Graham 3caa7a2325 [1.8.x] Post-release version bump. 2015-08-18 13:29:42 -04:00
Tim Graham acc3c1df84 [1.8.x] Bumped version for 1.8.4 release. 2015-08-18 08:36:48 -04:00
Tim Graham 2eb86b01d7 [1.8.x] Fixed DoS possiblity in contrib.auth.views.logout()
Thanks Florian Apolloner and Carl Meyer for review.

This is a security fix.
2015-08-18 08:15:15 -04:00
Caio Ariede 29fa1b5800 [1.8.x] Fixed #25180 -- Prevented varchar_patterns_ops and text_patterns_ops indexes for ArrayField.
Backport of dad8434d6f from master
2015-08-15 10:11:09 -04:00
Fabrizio Ettore Messina c652383379 [1.8.x] Fixed #25267 -- Corrected message for admin.E122 system check.
Backport of ece78684d9 from master
2015-08-13 13:14:17 -04:00
Andriy Sokolovskiy d5e3eb986d [1.8.x] Removed unreachable code
Backport of 4359be023b from master
2015-08-13 13:12:52 -04:00
Tim Graham e4b813c0e7 [1.8.x] Fixed #25160 -- Moved unsaved model instance data loss check to Model.save()
This mostly reverts 5643a3b51b and
81e1a35c36.

Thanks Carl Meyer for review.

Backport of 5980b05c1f from master
2015-08-10 11:31:22 -04:00
Claude Paroz cda66497aa [1.8.x] Updated Wikipedia links to use https
Backport of 64982cc2fb from master.
2015-08-08 12:09:53 +02:00
mlavin ac46eb7e83 [1.8.x] Fixed #25231 -- Added recording of squashed migrations in the migrate command.
Ensured squashed migrations are recorded as applied when the
migrate command is run and all of the original migrations
have been previously applied.

Backport of 69db1c7455 from master
2015-08-07 18:16:37 -04:00
Tim Graham ad2ac53054 [1.8.x] Fixed #25233 -- Fixed HStoreField.has_changed() handling of initial values.
Thanks Simon Charette for review.

Backport of a7b7f27c05 from master
2015-08-07 14:31:05 -04:00
Curtis Maloney 473af19273 [1.8.x] Fixed #25215 -- Solved reference to forms.HStoreField in declaration of HStoreField
Correct test which was using the model field in a test form.

Backport of 9f73009e98 from master
2015-08-04 19:19:05 +10:00
Alasdair Nicol 7a8460191e [1.8.x] Fixed #25206 -- Fixed error message when checking a ModelAdmin fieldset's fields.
Backport of 8972818289 from master
2015-08-03 08:59:13 -04:00
Tim Graham 6bb8258255 [1.8.x] Fixed #25204 -- Added missing space in runserver logging.
Backport of 1a76257b1b from master
2015-08-01 08:31:32 -04:00
Adam Chainz b46dad1bef [1.8.x] Fixed #25176 -- Prevented TestCase.setUpTestData() exception from leaking transaction.
Backport of 0abb06930f from master
2015-08-01 07:38:20 -04:00
Matt Johnson 05c7129bf2 [1.8.x] Fixed #12768 -- Fixed QuerySet.raw() regression on FK with custom db_column.
Backport of e063ac2fae from master
2015-07-23 18:44:58 -04:00
Tim Graham ca13fb021f [1.8.x] Fixed import order in django/core/serializers/json.py 2015-07-22 07:01:03 -04:00
Tim Graham 2cad91cac6 [1.8.x] Fixed #25147 -- Fixed debug view copy-paste/interactive toggle.
The whitespace added in 1101467ce0
broke the initial comparison.

Backport of d7848c11e0 from master
2015-07-20 11:52:44 -04:00
Cesar Canassa 83b32422aa [1.8.x] Fixed #25123 -- Corrected makemessages --extension help text
Backport of 561c018d88 from master
2015-07-14 07:36:17 -04:00
Daniel Roseman 4cc0baa98e [1.8.x] Fixed #25079 -- Added warning if both TEMPLATES and TEMPLATE_* settings are defined.
Django ignores the value of the TEMPLATE_* settings if TEMPLATES is also
set, which is confusing for users following older tutorials. This change
adds a system check that warns if any of the TEMPLATE_* settings have
changed from their defaults but the TEMPLATES dict is also non-empty.

Removed the TEMPLATE_DIRS from the test settings file; this was marked
for removal in 1.10 but no tests fail if it is removed now.

Backport of 24620d71f2 from master
2015-07-13 17:55:19 -04:00
Lukas Hetzenecker ebcfedb0e5 [1.8.x] Fixed #25019 -- Added UUID support in DjangoJSONEncoder
Backport of 6355a6d4f5 and 2e05ef4e18 from master.
2015-07-10 09:02:14 +02:00
Tim Graham fe367db35f [1.8.x] Post-release version bump. 2015-07-08 16:00:59 -04:00
Tim Graham 4217f1cdeb [1.8.x] Bumped version for 1.8.3 release. 2015-07-08 15:23:19 -04:00