mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-19 16:04:13 +00:00
Code Issues 24 Releases Wiki Activity
11,079 Commits 28 Branches 423 Tags 638 MiB
d17bc72880
Commit Graph

2195 Commits

Author SHA1 Message Date
Aymeric Augustin
d17bc72880 Fixed #17135 -- Made it possible to use decorators (like stringfilter) on template filter functions in combination with auto-escaping. Refs #16726. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-30 07:32:21 +00:00
Ramiro Morales
bebbc9e4a5 Made a couple of changes for readability and correctness in loaddata. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 22:32:28 +00:00
Aymeric Augustin
0a1a9b71fa Made the defaultfilters tests run on the actual filters, not on functions imported from django.utils. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 15:28:44 +00:00
Ramiro Morales
345be05622 Enhanced loaddata error message printed when no DB fixture is provided. 
Fixes #7043 by fixing the last code path where a misleading 'No fixtures found.' error message was being shown.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 14:47:45 +00:00
Ramiro Morales
24f3c06e4a More django.conf.urls.defaults removals. Refs #17132 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 12:24:44 +00:00
Carl Meyer
7a718f0f3a Fixed #17127 -- Made field validators list independent per form instance. Thanks claudep for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-28 14:38:41 +00:00
Aymeric Augustin
a693bbe0ac Fixed a test isolation problem that remained after r17042. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-27 06:17:24 +00:00
Aymeric Augustin
0cf139d201 Fixed several problems that hid one another in the cache tests and code. 
1 - Used django.test.TestCase instead of unittest.TestCase so that the override_settings decorator works.
2 - Reverted parts of r17039 that caused failures (masked until 1).
3 - Isolated tests by clearing the cache in tear down (masked until 1). Refs #11505.
4 - Fixed a bug in cache key generation (revealed by 3).
5 - Fixed a test that relied on this bug -- hardcoding the generated cache keys in tests isn't a very good idea anyway.
6 - Uniformized some parts of the cache tests.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 22:47:04 +00:00
Carl Meyer
233cdcf424 Fixed error message string assumptions in WSGI tests (were breaking tests on PyPy). Thanks to Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 21:07:12 +00:00
Aymeric Augustin
4cfb7632e0 Removed remains from times when tests could be run outside of runtests.py. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 21:03:18 +00:00
Aymeric Augustin
4819797f70 Improved settings manipulation in the cache tests with the suitable decorators and context managers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 20:55:36 +00:00
Julien Phalip
9796f69533 Fixed #16257 -- Added new ModelAdmin.get_list_display_links() method to allow for the dynamic display of links on the admin changelist. Thanks to graveyboat for the suggestion and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 12:19:18 +00:00
Julien Phalip
600c576ac5 Fixed #17090 -- Made the API specification for ModelAdmin.get_list_display() more consistent with that of ModelAdmin.list_display by separating out the admin action check boxes business. This is backwards-incompatible for those who have been using the still-unreleased get_list_display() method. Thanks to Ramiro Morales for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 09:37:07 +00:00
Julien Phalip
4d79083453 Fixed #17111 -- Made the redirect_to generic view properly handle query strings with percent symbols. Thanks, Chris Adams. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 06:33:13 +00:00
Julien Phalip
2e2689c7c0 Fixed #15938 -- Prevented the max_length number in the admin prepopulated_fields javascript to be localized when USE_THOUSAND_SEPARATOR is turned on. Thanks to Lev Maximov, Mathieu Agopian and feel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 05:33:17 +00:00
Aymeric Augustin
965c5d7cce Fixed #14202 -- made the atom:link element optional in feeds. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-23 15:19:09 +00:00
Julien Phalip
4f00a2d316 Fixed #15826 -- Made assertContains and assertNotContains work with SimpleTemplateResponse by forcing it to be rendered if it hasn't been rendered yet. Thanks to bmihelac for the report, to mmcnickle for the initial patch and tests, and to Carl Meyer for the guidance. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 09:15:50 +00:00
Carl Meyer
145a77edc9 Fixed #16360 -- Added WSGI entrypoint to startproject layout, and enabled internal servers (runserver and runfcgi) to use an externally-defined WSGI application. Thanks to Armin Ronacher, Jannis Leidel, Alex Gaynor, ptone, and Jacob Kaplan-Moss. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 04:30:10 +00:00
Julien Phalip
1452cecd15 Fixed 16938 -- Ensured that the active locale's formats take precedence over the default settings even if they would be interpreted as False in a conditional test (e.g. 0 or empty string). Thanks to pikerr for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-20 12:14:06 +00:00
Julien Phalip
26698bc851 Fixed #14806 -- Added support for contextual translations to the trans and blocktrans template tags. Thanks to jtiai for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-19 04:59:47 +00:00
Aymeric Augustin
2bc77be12e Fixed #17054 -- Ensured the test suite runs when gettext isn't available, after r16981. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 20:35:42 +00:00
Aymeric Augustin
14d24eb438 Fixed #17067 -- reverted some backwards-incompatible changes from r16933 and added tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 16:42:32 +00:00
Ramiro Morales
ab72e6bdd1 Tweaked a tests tweak from r16960 so it uses the right model. 
When testing for permission enforcement in the admin for m2m
relationships we were erroneously using the ID of the related model
instead of using the ID of the corresponding automatically created
intermediate model. This manifested as a failure under Oracle but can
fail with any backend if the IDs of both models diverge.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 02:11:12 +00:00
Ramiro Morales
d48510cc6b Tweaked admin_scripts tests enhanced in r16964 a bit more so they don't fail with Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 00:34:42 +00:00
Ramiro Morales
5f2be4ecbb Fixed #17056 -- Tweaked insert SQL clause generation so a corner case doesn't fail with Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 20:06:59 +00:00
Aymeric Augustin
8fb7a90026 Fixed multiple database tests that broke foreign keys constraints. Refs #17055. 
The problem was masked by the rollback at the end of each transactional test on backends that deferred constraints checks; it appeared only on MySQL + InnoDB.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@16995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 11:04:34 +00:00
Aymeric Augustin
03316579f4 Fixed a test that depended on how identifiers are quoted by the database backend and broke under MySQL. Refs #17055. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 09:51:22 +00:00
Julien Phalip
93a581431a Fixed #15221 -- Made the admin filters on foreign key and m2m relationships display the related field's verbose name instead of that of the related model. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 06:42:50 +00:00
Aymeric Augustin
22d738c2dc Ensured that the feeds framework supports both datetimes and dates. Refs #4076. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-15 10:16:24 +00:00
Alex Gaynor
69e1e6187a Switch several assertNumQueries to use the context manager, which is much more beautiful. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 17:03:08 +00:00
Alex Gaynor
6c91521902 Remove the usage of deprecated function in Django. Also simplify the fallback code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:20:50 +00:00
Alex Gaynor
5109ac3709 Fix a Python 2.5-ism. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:44:58 +00:00
Alex Gaynor
8c0eefd066 Convert the remainder of the relative imports in the tests to be absolute imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:34:56 +00:00
Aymeric Augustin
f830166167 Fixed #16899 -- Backported the fix for http://bugs.python.org/issue9063 and added a test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:19:48 +00:00
Aymeric Augustin
06d9b82a27 Fixed #16906 -- Format datetimes with str/unicode instead of strftime where possible: it's faster and it works for all dates. 
Also ensured that datetime_safe is used wherever strftime is called on dates/datetimes that may be before 1900.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@16978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 19:23:45 +00:00
Alex Gaynor
b7845768cb Fix the dispatch tests on python 2.5 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 19:18:27 +00:00
Alex Gaynor
d362c1546f Convert much of the regression tests to use absolute imports. There's still work to be done though. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 18:51:33 +00:00
Julien Phalip
99512d3544 Fixed #16918 -- Ensured that custom querysets are used when provided to BaseDateDetailView.get_object(). Thanks to mitar for the report, to koenb for the patch and to Preston Holmes for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 13:38:38 +00:00
Alex Gaynor
43920cd32e Remove a handful of import * from the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 12:53:02 +00:00
Carl Meyer
38f1fe3b35 Fixed #15372 -- Switched to a startproject default layout that allows us to avoid sys.path hacks. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 05:56:15 +00:00
Carl Meyer
8b801a7553 Fixed some tests from r16934 to be auto-id-independent. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-11 21:55:45 +00:00
Julien Phalip
17659adf93 Fixed #16371 -- Added a prefix "field-" to all CSS class names automatically generated from field names in admin forms to avoid conflicts with other common class names (e.g. "button"). This is backwards-incompatible for those who previously used plain field names as selector in custom style sheets or javascript transformations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 12:35:06 +00:00
Julien Phalip
095dbe8804 Made the tests introduced in r16942 use old-style class decoration to run with Python < 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 11:36:05 +00:00
Carl Meyer
b6ad1afa68 Fixed #17011 - Made override_settings modify a decorated class in-place rather than creating a dynamic subclass, so as to avoid infinite recursion when used with super(). Thanks jsdalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 08:16:17 +00:00
Carl Meyer
b1b1da1eac Fixed #8060 - Added permissions-checking for admin inlines. Thanks p.patruno for report and Stephan Jaensch for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 00:41:25 +00:00
Aymeric Augustin
e2f9c11736 Fixed #16705 - Made the test client adhere to the WSGI spec -- in particular, removed the assumption that environ['QUERY_STRING'] exists. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-06 20:39:15 +00:00
Ramiro Morales
0d9b6a5bc4 Fixed #10841 -- Switched response served when DEBUG=True and request.is_ajax() returns True (indicating request has been generated by a JS library) to a plain text version for easier debugging. 
Contents of this response are similar to its HTML counterpart modulo frame variables values in the Python traceback section.

Thanks to Riz for the report, to SmileyChris for the patch and to Julien for reviewing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-02 02:53:58 +00:00
Luke Plant
10d90cba83 Fixed #16935 - misleading message if AttributeError escapes during SimpleTemplateResponse.render 
Thanks to isagalaev for the report.

As discussed on django-devs, this reverts some of the changes in [16568]
i.e.  the addition of `SimpleTemplateResponse.__getattr__`, because this
makes it much harder to debug the common case of an AttributeError somewhere
during the rendering of a SimpleTemplateResponse.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 11:46:23 +00:00
Luke Plant
5009e45dfe Fixed #14270 - related manager classes should be cached 
Thanks to Alex Gaynor for the report and initial patch, and mrmachine for
more work on it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:41:25 +00:00
Jannis Leidel
2eadc418af Fixed doc references to django.db.models.query.QuerySet and converted some tabs that were introduced in r16699 to spaces. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:28:39 +00:00