mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity
10,437 Commits 28 Branches 423 Tags 717 MiB
64e19ffb4e
Commit Graph

2585 Commits

Author SHA1 Message Date
Jannis Leidel
64e19ffb4e Fixed #7704, #14045 and #15495 -- Introduce a lexer for Javascript to fix multiple problems of the translation of Javascript files with xgettext. Many thanks to Ned Batchelder for his contribution of the JsLex library. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-07 16:11:25 +00:00
Ramiro Morales
0638ba5bba Enhanced a bit the documentation and docstring for the url template tag. Also, added a test for it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-05 23:44:34 +00:00
Luke Plant
d41a25ebc6 Fixed import error that was causing EggLoader tests not to be run 
Also improved ImportError handling that was causing this fact to be missed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-04 14:32:55 +00:00
Luke Plant
cb996cce05 Fixed various bugs related to having multiple columns in admin list_display with the same sort field 
Thanks to julien for the report

Refs #11868

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-03 11:54:29 +00:00
Luke Plant
5434ce231d Fixed #11868 - Multiple sort in admin changelist. 
Many thanks to bendavis78 for the initial patch, and for input from others.

Also fixed #7309. If people were relying on the undocumented default ordering
applied by the admin before, they will need to add 'ordering = ["-pk"]' to
their ModelAdmin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-02 16:18:47 +00:00
Luke Plant
65cc646c48 Removed a broken test added in [16312] 
This test caused a test failure (in subclass CustomModelAdminTest), and the
test also proved to be extremely brittle when trying to implement #11868,
and basically unfixable with current infrastructure.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-02 00:24:37 +00:00
Luke Plant
2304ca4236 Fixed bug with __str__ headers in admin changelist have a non-functioning sort URL 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-01 23:17:40 +00:00
Ramiro Morales
2367089392 Tweaked test added in [16308] so it doesn't fail. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-01 22:09:50 +00:00
Alex Gaynor
06279e454a Fix the staticfiles_tests and django.conf to not think that None meant a lazy object hadn't been evaluated. Thanks to Jannis for informing me that I broke the test suite (if you were harmed by this I'll buy you a cookie). Sorry. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-01 20:45:47 +00:00
Alex Gaynor
60cf3f2f84 Allow SimpleLazyObjects to return None without constantly being reevaluated, also proxy `__nonzero__`, and do some codecleanup as well. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-01 15:30:06 +00:00
Jannis Leidel
632dfa2338 Fixed #9200 -- Added new form wizard to formtools based on class based views. Many thanks to Stephan Jäkel, ddurham and ElliottM for their work. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-01 13:47:00 +00:00
Luke Plant
4531767700 Fixed auth context processor tests, which were not running at all previously. 
It seems they were accidentally disabled following being moved from
regressiontests in [15990]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-31 15:19:19 +00:00
Luke Plant
93e9d91501 Fixed #15805 - assertFieldOutput should not use assertRaisesRegexp 
Thanks to julien for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-31 14:02:22 +00:00
Luke Plant
524c5fa07a Fixed #14261 - Added clickjacking protection (X-Frame-Options header) 
Many thanks to rniemeyer for the patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-30 22:27:47 +00:00
Luke Plant
dc4c2f3add Fixed #15929 - test.client.RequestFactory keeps state/AuthMiddleware does monkey patching 
Thanks to m.vantellingen for the report and tests, and to aaugustin for
work on the tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-30 16:33:23 +00:00
Luke Plant
de3b58d626 Fixed #15776 - delete regression in Django 1.3 involving nullable foreign keys 
Many thanks to aaron.l.madison for the detailed report and to emulbreh for
the fix.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-30 16:04:25 +00:00
Jannis Leidel
d34bb3c833 Fixed #16108 -- Fixed another race condition in the FileSystemStorage backend with regard to deleting a file. Refs #16082, too. Thanks, Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-28 13:06:08 +00:00
Ramiro Morales
d0716044dd Changed a bit the strategy used to test staticfiles finders so they can cope with even more differences in case of paths under Windows. Refs #14961 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-27 10:55:07 +00:00
Ramiro Morales
c3db0b058c Modified a couple of i18n regression tests to make them run under Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-26 21:03:56 +00:00
Jannis Leidel
723b620c7e Fixed #16082 -- Fixed race condition in the FileSystemStorage backend with regard to creating directories. Thanks, pjdelport. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-26 08:21:35 +00:00
Ramiro Morales
0065d8a120 Made expected output platform-independent in a test for the template postmortem debug 500 view so it doesn't fail under Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-24 21:33:32 +00:00
Luke Plant
a482cc0ba3 Fixed #16004 - csrf_protect does not send cookie if view returns TemplateResponse 
The root bug was in decorator_from_middleware, and the fix also corrects
bugs with gzip_page and other decorators.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-24 21:28:43 +00:00
Jannis Leidel
4a4b6b271e Fixed #16080 -- Handle admin list filter items with two characters better. Thanks, Ales Zoulek and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-24 09:17:55 +00:00
Ramiro Morales
c0303f5d81 Workaround particularities of Python under Windows that interfere with expected outputs in admin_scripts regression tests. 
Thye were causing most of them to fail in such platform.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@16273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-23 18:54:02 +00:00
Luke Plant
e683beb607 Changed utils/decorators.py tests to use RequestFactory 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-23 16:08:45 +00:00
Luke Plant
55c2c302c1 Refactoring of 'fully_decorated' for clarity and removal of duplication. 
Also allows re-use of 'full_decorator' if we need it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-23 16:08:36 +00:00
Chris Beaven
fcf7fbc68c Fixes #8593 -- better handling of safe_join case sensitivity on windows. Thanks for the initial patch, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-22 23:56:42 +00:00
Karen Tracey
909e002808 Fix UnboundLocalError than could occur during ModelAdmin validation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-22 15:51:22 +00:00
Jannis Leidel
d95355b6db Fixed #16048 -- Use the base manager instead of the default manager to retrieve a related object of a GenericForeignKey similar to ForeignKeys. Thanks, adurdin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-22 15:21:03 +00:00
Jannis Leidel
fc8116cc4f Fixed #6580 -- Added default parameter to MultiValueDict.getlist method (the base class for QueryDict). Many thanks to mk and andrewebdev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-22 15:05:29 +00:00
Ramiro Morales
a8598c7de2 Fixed #11789 -- Fixed aggregates so it interacts with QuerySet none() in a way consistent with other empty query sets. Thanks alexr for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-21 16:54:25 +00:00
Jannis Leidel
f60d428463 Fixed #12417 -- Added signing functionality, including signing cookies. Many thanks to Simon, Stephan, Paul and everyone else involved. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-21 14:41:14 +00:00
Ramiro Morales
15793309e1 Fixed #14476 -- Fixed resolution of automatically generated annotation names so e.g. filtering based on them works. Thanks dirleyls for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-21 13:12:23 +00:00
Jannis Leidel
5dec36de15 Removed a settings test introduced in r16237 that didn't run on Python < 2.6 due to a SyntaxError raise regarding the class decorators. Thanks for the hint, Julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-18 12:30:22 +00:00
Jannis Leidel
a3a53e0b73 Fixed #15561 -- Extended test setting override code added in r16165 with a decorator and a signal for setting changes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-18 12:08:53 +00:00
Honza Král
ee8f6ca405 Fixed #14572 -- generic_inlineformset_factory shouldn't specify default formfield_callback. Thanks prestontimmons! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-17 12:45:02 +00:00
Jannis Leidel
578a31fea3 Fixed #15921 -- Refined naturaltime filter added in r16071 to use timesince and timeuntil filters as fallbacks instead of date filter. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-17 10:16:12 +00:00
Jannis Leidel
9ad005ec1c Updated humanize tests to use the FixedOffset timezone from the utils and removed a bit code smell while I'm here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-17 10:15:58 +00:00
Ramiro Morales
07bfc76ecf Fixed #15790 -- Fixed QuerySet only() and defer() methods behavior with proxy models. Thanks Michal Modzelewzki for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-15 00:56:01 +00:00
Ramiro Morales
2b5730873b Added ability to describe grouping of form fields in the same row to the fields ModelAdmin attribute. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-14 16:29:39 +00:00
Ramiro Morales
1d7fa75c97 Fixed #15064 -- Made manage.py honor the existence and value of DJANGO_SETTINGS_MODULE env var. Thanks olau for the report and Shawn Milochik for a patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-13 12:15:52 +00:00
Jannis Leidel
ae3fec0da8 Fixed minor typo in tests introduced in r16121. Refs #5925. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-12 13:24:07 +00:00
Luke Plant
73721912e2 Fixed #16002 - test failure due to missing from __future__ import with_statement 
Thanks to julien for the report

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-11 08:58:58 +00:00
Luke Plant
724c84fe90 Fixed #13648 - '%s' escaping support for sqlite3 regression. 
Thanks to master for the report and initial patch, and salgado and others
for work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-10 12:20:47 +00:00
Luke Plant
cb060f0f34 Fixed #15258 - Ajax CSRF protection doesn't apply to PUT or DELETE requests 
Thanks to brodie for the report, and further input from tow21

This is a potentially backwards incompatible change - if you were doing
PUT/DELETE requests and relying on the lack of protection, you will need to
update your code, as noted in the releaste notes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-09 23:45:54 +00:00
Luke Plant
8cbcf1d3a6 Fixed #14134 - ability to set cookie 'path' and 'secure' attributes of CSRF cookie 
Thanks to cfattarsi for the report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-09 23:00:22 +00:00
Luke Plant
b6c5f8060d Fixed #15354 - provide method to ensure CSRF token is always available for AJAX requests 
Thanks to sayane for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-09 21:35:24 +00:00
Luke Plant
385ae343fb Fixed #15709 - Duplicated group_by condition 
Thanks to ziangsong for report, and to mk for the patch

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 19:02:51 +00:00
Jannis Leidel
32bd953e63 Minor renaming for consistency. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 17:05:06 +00:00
Jannis Leidel
2abd7af4dd Fixed #11212 -- Stopped using quoted-printable encoding for mails with non-ASCII characters but rely on 8bit encoding instead. Thanks, phr, gisle and Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 16:59:33 +00:00