mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 23:44:22 +00:00
Code Issues 24 Releases Wiki Activity
11,671 Commits 28 Branches 423 Tags 639 MiB
3cc2cdddb3
Commit Graph

3082 Commits

Author SHA1 Message Date
Jannis Leidel
3a5f9cd1ae Fixed #17861 -- Took care of special characters when creating the staticfiles storage cache keys. Many thanks to Preston Holmes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 20:28:09 +00:00
Adrian Holovaty
dd246a62c7 Edited some docs and docstrings until [17685] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 20:05:48 +00:00
Karen Tracey
20c69c5e51 Fix #17879: Corrected regression in python (inherited by yaml and json) serializer that prevented serializing model instances with null FK ref to a model when serializing with natural keys. Thanks danfairs and tmitchell. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 19:41:31 +00:00
Ramiro Morales
4cd9b4bb50 Fixed #17327 (again) -- Moved createsuperuser tests added in r17665. 
In their new location they won't cause multi-db-related errors when
users run contrib.auh tests together with their application tests.

Thanks brianriley for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-10 17:36:41 +00:00
Ramiro Morales
ecc8208f88 Removed executable bits from some files that don't need them. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-09 12:13:31 +00:00
Aymeric Augustin
bf0abe0ea6 Fixed #17830 -- Modified list_filter on DateTimeFields to account for the new time zone support. Thanks Glenn Washburn for the report and Jannis Leidel for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 12:27:19 +00:00
Aymeric Augustin
f95141abcc Added change forgotten in r17668. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 10:30:00 +00:00
Julien Phalip
399aa72330 Enabled the existing admin Selenium tests to be run with Internet Explorer. Note that some tweaks had to be made, in particular as IE7 has limited capabilities regarding CSS selectors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 08:13:09 +00:00
Carl Meyer
7e92ad8506 Fixed #16128 - Correctly cascade-delete proxy models as if they were the concrete model class. Thanks xkennyx for the report, and Aymeric Augustin, Claude Paroz, Adam Nelson, jaap3, and Anssi Kääriäinen for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 03:41:01 +00:00
Karen Tracey
20b021e506 Fix staticfiles_tests.TestCollectionCachedStorage.test_post_processing so it passes on Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-04 16:47:28 +00:00
Julien Phalip
794fe19e19 Made the Selenium tests for the admin horizontal/vertical filter widgets a bit more thorough. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-04 04:50:58 +00:00
Julien Phalip
4dca9d166a Added more thorough Selenium tests for the admin horizontal/vertical filter widgets. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-04 01:20:03 +00:00
Jannis Leidel
dd441701ce Fixed #17717 (again) -- Used the new API for concrete models added in r17573. Many thanks to Simon Charette and Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 21:34:51 +00:00
Jannis Leidel
c988397279 Fixed #10498 -- Fixed using ugettext_lazy values when creating model instances. Thanks to Claude Paroz and Jonas Obrist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 19:02:49 +00:00
Jannis Leidel
dc49e6143a Fixed #17717 -- Fixed serialization of proxy models. Thanks, Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 17:50:18 +00:00
Aymeric Augustin
48840cc9d1 Fixed a typo in r17638. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 17:41:32 +00:00
Ramiro Morales
3b2c53ac69 Modified a test added in r17508 to not run under Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 17:16:43 +00:00
Julien Phalip
d636150e53 Fixed #17198 -- Ensured that a deterministic order is used across all database backends for displaying the admin change list's results. Many thanks to Luke Plant for the report and general approach, to everyone involved in the design discussions, and to Carl Meyer for the patch review. Refs #16819. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 02:13:35 +00:00
Jannis Leidel
126d9e1b49 Fixed #17817 -- Modified LocalMiddleware to use full URLs when redirecting to i18n URLs. Thanks to Paul for keeping an eye on the standards. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 22:35:26 +00:00
Adrian Holovaty
2ade1e916f Edited stuff from [17543] to [17629] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 17:16:52 +00:00
Jannis Leidel
4887a8de17 Fixed #16842 -- Modified the RedirectView to correctly handle query strings with percent symbols. Thanks, accuser, jamey@minilop.net and Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 16:55:56 +00:00
Jannis Leidel
e88a65660f Fixed #17806 -- Fixed off-by-n error in the CachedStaticFilesStorage that prevented it from finding files in nested directories. Many thanks to lpetre. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 11:29:14 +00:00
Jannis Leidel
746987f916 Fixed #17734 -- Made sure to only redirect translated URLs if they can actually be resolved to prevent unwanted redirects. Many thanks to Orne Brocaar and Anssi Kääriäinen for input. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 11:07:36 +00:00
Paul McMillan
fe7ccdc5be Fixed test cases that generate their own settings file. 
Now they include SECRET_KEY.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 03:42:20 +00:00
Jannis Leidel
df1e505d9f Added a default SECRET_KEY setting to the default test sesttings (refs #17800). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 00:05:13 +00:00
Jannis Leidel
1c33c0a02a Fixed #17737 -- Stopped the collectstatic management command from copying the wrong file in repeated runs. Thanks, pigletto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 23:02:38 +00:00
Luke Plant
3db5b0e485 Fixed #17696 - Queryset prefetch_related() ignores using() 
Thanks to simon29 for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 00:57:01 +00:00
Luke Plant
de9942a667 Fixed #17668 - prefetch_related does not work in in_bulk 
Thanks to gurets for the report, and akaariai for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-28 19:34:04 +00:00
Aymeric Augustin
ce88b57b9a Fixed #17755 -- Ensured datetime objects that bypass the model layer (for instance, in raw SQL queries) are converted to UTC before sending them to the database when time zone support is enabled. Thanks Anssi for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 21:15:25 +00:00
Ramiro Morales
4bbacd2663 Modified tests introduced in r15452 to not run 31 test cases twice. Thanks Julien for discovering this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 13:29:56 +00:00
Julien Phalip
f2de5f4cab Added some Selenium tests for the admin's filter_horizontal and filter_vertical widgets. Ref #13614, #15220. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-23 08:07:07 +00:00
Aymeric Augustin
8b53616198 Fixed #17728 -- When filtering an annotation, ensured the values used in the filter are properly converted to their database representation. This bug was particularly visible with timezone-aware DateTimeFields. Thanks gg for the report and Carl for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 19:40:27 +00:00
Julien Phalip
a65eed3942 Enabled the admin selenium tests to run on Chrome. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 07:14:10 +00:00
Carl Meyer
354c84d277 Fixed #17678 -- Corrected setup of _meta.proxy_for_model and added _meta.concrete_model. Thanks Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 05:26:50 +00:00
Chris Beaven
3ac0961e1e Don't let ALLOWED_INCLUDE_ROOTS be accidentally set to a string rather than a tuple. Thanks to Florian Apolloner for pointing this out. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 00:42:19 +00:00
Chris Beaven
0e54c23caf Fixed #17660 -- Standardize extends tag token parsing 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-21 02:59:05 +00:00
Julien Phalip
f0c2228709 Fixed #13068 (again) -- Corrected the admin stacked inline template to allow prepopulated fields to work (Thanks Stanislas Guerra for the report). Also fixed a regression introduced in [16953] where prepopulated fields wouldn't be recognized any more due to the additional "field-" CSS class name prefix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 16:42:12 +00:00
Jannis Leidel
7dd0ceba2e Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 13:37:30 +00:00
Aymeric Augustin
52b06e29c7 Prevented the generic views from automatically creating a HEAD method when there is no GET. Reverts r16105, refs #17449. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 09:50:03 +00:00
Jannis Leidel
758a0cd0f1 Fixed #17689 -- Stopped the CachedStaticFilesStorage from trying to hash paths that aren't files. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-16 14:40:32 +00:00
Alex Gaynor
b9b3e9f0ef Use Python's changed comparisons, which makes this a bit more readable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-16 01:10:21 +00:00
Paul McMillan
6072e108e2 Fixed #17693. Input validation and tests for base36 conversion utils. Thanks Keryn Knight for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-16 00:58:49 +00:00
Aymeric Augustin
2000f375cd Fixed #17675 -- Changed the implementation of the {% regroup %} template tag to use the context properly when resolving expressions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-14 21:29:50 +00:00
Jannis Leidel
4f1ac8f5f1 Minor bugfixing of the staticfiles app following upstream development in django-staticfiles. 
- Create the files to ignore during the tests dynamically (.hidden and backup~)
- Refactored the post_processing method of the CachedFilesMixin storage mixin to be less time consuming.
- Refactored handling of fragments in the post_process method.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-13 10:51:17 +00:00
Jannis Leidel
1c9c29b5b2 Fixed AdminEmailHandler to format the subject message correctly when arguments are passed. 
This bug was hidden before r17480 as it basically didn't take the arguments into account. Refs #14973.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-12 12:19:02 +00:00
Ramiro Morales
98b4572ef7 Fixed #15216 -- Made return type of an internal DB introspection method consistent. 
Thanks arthur AT milliways DOT fr for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-11 22:12:49 +00:00
Ramiro Morales
a411242e94 Fixed #17676 -- Fixed introspection of column names that start with digit(s). 
Thanks Gandalfar for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-11 20:53:48 +00:00
Ramiro Morales
ccc0e122d4 Fixed #7783 -- Made introspection of nullable columns more robust with Postgres. 
Thanks bthomas AT ncorcle DOT com for the report and initial patch, and
Claude Paroz for the final, complete patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-11 20:05:50 +00:00
Julien Phalip
130e7ab617 Fixed #17256 -- Ensured that content types get cached when retrieved by natural key. Thanks, defaultwombat and charettes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-11 09:55:54 +00:00
Julien Phalip
995f7a16a8 Fixed #17281 -- Prevented AdminErrorHandler from silently failing if the log message contains newlines. Thanks to Russell Keith-Magee for the report and to Bartolome Sanchez Salado and Marcin Wróbel for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-11 09:31:18 +00:00