p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,591 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

6649 Commits

Author SHA1 Message Date
Tim Graham 8b99603120 [1.8.x] Fixed admin_filters test failures when run in reverse. 
Backport of b1b14587ae from master
 2015-11-14 11:32:09 -05:00
Dmitry Dygalo e9c9f2ed82 [1.8.x] Fixed #25666 -- Fixed the exact lookup of ArrayField. 
Backport of 263b3d2ba1 from master
 2015-11-14 11:24:21 -05:00
Tim Graham a517a3c531 [1.8.x] Bumped mysqlclient test requirement to >= 1.3.7. 
mysqlclient 1.3.7 fixes the test failures caused by 1.3.6.

Backport of 2514e044a7 from master
 2015-11-12 21:34:49 -05:00
Matthew Somerville 2c96b3da6f [1.8.x] Refs #24937 -- Backported more commits to fix for serialization of Date(Time)RangeField. 
Instead of using DjangoJSONEncoder, use base_field's value_to_string().

Note this means the serialization of e.g. IntegerRangeField now has
strings for lower and upper, so use to_python when they came back in
(same behaviour as ArrayField, hopefully, from where I also got the
set_attributes_from_name function).

Backport of 86d9b10dc3 and
8a842148b6 from master
 2015-11-12 09:22:44 -05:00
Matthew Somerville 3ded51bcf2 [1.8.x] Fixed #24937 -- Fixed serialization of Date(Time)RangeField. 
Use the DjangoJSONEncoder so that datetime and date are encoded
appropriately.

Backport of 2926559cce from master
 2015-11-11 16:53:26 -05:00
Simon Charette ae4613803c [1.8.x] Refs #25693 -- Added a regression test for `to_attr` validation on forward m2m. 
Backport of cc8c02fa0f from master
 2015-11-11 12:30:37 -05:00
Marti Raudsepp 9cdfdbdd1f [1.8.x] Fixed #25720 -- Made gettext() return bytestring on Python 2 if input is bytestring. 
This is consistent with the behavior of Django 1.7.x and earlier.

Backport of d3e3703a15 from master
 2015-11-11 08:57:46 -05:00
Ian Foote 5fc9a1b8bd [1.8.x] Fixed #25693 -- Prevented data loss with Prefetch and ManyToManyField. 
Thanks to Jamie Matthews for finding and explaining the bug.

Backport of 4608573788 from master
 2015-11-10 12:12:52 -05:00
Marti Raudsepp 3144785ebf [1.8.x] Fixed #25683 -- Allowed ModelChoiceField(queryset=...) to accept Managers. 
This fixes a regression from refs #25496.

Backport of 1155843a41 from master
 2015-11-09 12:47:08 -05:00
Josep Cugat a42c5376e7 [1.8.x] Fixed #25686 -- Fixed crash on routers without an allow_migrate() method. 
Thanks Simon Charette for review.
 2015-11-09 10:50:02 -05:00
Aymeric Augustin 94d13415d8 [1.8.x] Fixed debug view crash during autumn DST change. 
This only happens if USE_TZ = False and pytz is installed (perhaps not
the most logical combination, but who am I to jugde?)

Refs #23714 which essentially fixed the same problem when USE_TZ = True.

Thanks Florian and Carl for insisting until I wrote a complete patch.

Backport of 1014ba026e from master
 2015-11-07 23:18:59 +01:00
Simon Charette c42e4e736a Fixed #25622 -- Accounted for generic relations in the admin to field validation 
Thanks to Jonathan Liuti for the report and Tim Graham for the review.

Conflicts:
	django/contrib/admin/options.py
 2015-10-29 13:20:44 -04:00
Dheerendra Rathor 540de2f797 [1.8.x] Fixed #25620 -- Made URLValidator prohibit URLs with consecutive dots in the domain section. 
Backport of 96fe90f535 from master
 2015-10-29 11:14:36 -04:00
Tim Graham 2bfd80d845 [1.8.x] Ignored docutils deprecation warnings in runtests.py. 
Backport of dbe79d9660 from master
 2015-10-28 14:08:26 -04:00
Tim Graham 69e6045ceb [1.8.x] Fixed #25597 -- Fixed crash with SplitArrayField and IntegerField on invalid value. 
Backport of 1f07da3e29 from master
 2015-10-27 08:13:27 -04:00
Tim Graham 95b1ae76ba [1.8.x] Refs #23763 -- Fixed SMTPServer Python 3.5 deprecation warning in mail test. 
Backport of 7d97c5745e from master
 2015-10-25 06:02:21 -04:00
Claude Paroz 244b7c930f [1.8.x] Fixed #25592 -- Fixed misnamed strictly_above PostGIS lookup 
Fixes a regression from 2bd1bbc42. Thanks Daniel Wiesmann for the report
and Tim Graham for the review.
Backport of c08f85fd54 from master.
 2015-10-22 20:35:54 +02:00
Tim Graham cf1038d8e3 [1.8.x] Fixed #25562 -- Skipped a time dependent admin_filters test on Windows. 
Backport of 4a50daf6b3 from master
 2015-10-19 20:27:41 -04:00
Simon Charette 71962629c0 [1.8.x] Fixed #25563 -- Cached deferred models in their proxied model's _meta.apps. 
Thanks to Andriy Sokolovskiy for the report and Tim Graham for the review.

Backport of 3db3ab71e9 from master
 2015-10-19 20:13:47 -04:00
Josh Smeaton 42e029f6c4 [1.8.x] Fixed #25517 -- Made Concat function idempotent on SQLite. 
Backport of 6c95b134e9 from master
 2015-10-17 15:58:17 -04:00
Tim Graham a8133e73a7 [1.8.x] Used SchemaEditor.delete_model() for teardown in schema tests. 
Some third-party database backends (MSSQL) have custom
delete_model() requirements that must be executed.

Backport of 4dcc2a1955 from master
 2015-10-16 09:34:38 -07:00
Antoine Catton ee6785ebea [1.8.x] Fixed #25506 -- Allowed filtering over a RawSQL annotation. 
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>

Backport of b971c1cd78 from master
 2015-10-14 12:21:36 -07:00
Andriy Sokolovskiy eb85e6672a [1.8.x] Fixed #24156 -- Fixed inherited related name of ManyToManyField. 
Fixed situation when parent abstract model declares related_name='+'
and child models had an invalid queryset.

Backport of f7b2978158 from master
 2015-10-13 04:17:50 -07:00
Mariusz Felisiak 4ec96b776b [1.8.x] Fixed #25503 -- Fixed system check crash on ForeignKey to abstract model. 
Backport of 914167abf1 from master
 2015-10-06 19:26:00 -04:00
Riccardo Magliocchetti e2db171e15 [1.8.x] Refs #12118 -- Allowed "mode=memory" in SQLite test database names. 
Backport of 3543fec3b7 from master
 2015-10-06 12:33:24 -04:00
Tim Graham de570d4da9 [1.8.x] Fixed #25496 -- Made ModelChoiceField respect prefetch_related(). 
Backport of 6afa6818fc from master
 2015-10-05 19:25:21 -04:00
Ben Kraft c03f0c282d [1.8.x] Fixed #25389 -- Fixed pickling a SimpleLazyObject wrapping a model. 
Pickling a `SimpleLazyObject` wrapping a model did not work correctly; in
particular it did not add the `_django_version` attribute added in 42736ac8.
Now it will handle this and other custom `__reduce__` methods correctly.

Backport of 35355a4ffe from master
 2015-10-03 13:03:05 -04:00
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
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
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
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
Tim Graham 4f0966e75f [1.8.x] Added a version requirement to mysqlclient in test requirements. 
Backport of fc8a6a9b00 from master
 2015-09-17 15:11:41 -04:00
Tim Graham 120be9b6c0 [1.8.x] Added a version requirement to python-memcached in test requirements. 
Backport of 12a62e7e4b from master
 2015-09-17 15:10:13 -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
Renato Oliveira f328ebdede [1.8.x] Fixed #25382 -- Removed obsolete references to DateQuerySet. 
Backport of e3720b990a from master
 2015-09-11 12:21:11 -04: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 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 6af1e47aab [1.8.x] Refactored autoreload tests. 
* Added helpers to test uncached and cached access.
* Fixed test_project_root_locale: it duplicated test_locale_paths_setting.
* Rewrote test_only_new_files: test more cases.

Backport of dfa712efb8 from master
 2015-08-29 23:09:57 +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 0e3a8c22df [1.8.x] Fixed typo in tests/migrations/test_autodetector.py. 
Backport of 01966bb2a7 from master
 2015-08-20 14:52:36 -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 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