mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Code Issues 25 Releases Wiki Activity
11,560 Commits 28 Branches 426 Tags 667 MiB
3ac0961e1e
Commit Graph

223 Commits

Author SHA1 Message Date
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
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
a6b6c6e171 Fixed #16416 -- Added two new date formatting options for timezones and ISO week numbers. Thanks, poirier. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:57:31 +00:00
Julien Phalip
6ae393d74d Fixed #15092 -- Made {% now %} work with single-quoted string arguments. Thanks to ninja_otoko for the report and to steveire, Aymeric Augustin and Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-24 08:02:34 +00:00
Adrian Holovaty
20c8aa2a20 Fixed various dodgy behaviours 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-17 17:37:24 +00:00
Aymeric Augustin
a4e516b593 Fixed #11166 -- {% widthratio %} should return 0 when the maximum is 0, no matter the value. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-17 10:27:14 +00:00
Aymeric Augustin
19cbdf8c8f Fixed #17348 -- Implemented {% elif %}. Refs #3100. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 22:13:27 +00:00
Adrian Holovaty
9b93f1c01c Added a test that 'firstof' template filter doesn't auto-escape. cycle tag already has such a test (cycle20). Refs #10912 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 19:52:20 +00:00
Aymeric Augustin
c5a899b190 Fixed #16787 -- Restored the ability to {% load %} template tags libraries within packages. Thanks Ivan Sagalaev for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-21 10:28:12 +00:00
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
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
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
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
Julien Phalip
8137027fd7 Fixed #13956 -- Enabled *args and **kwargs support for simple_tag, inclusion_tag and assignment_tag. Many thanks to Stephen Burrows for the report and initial patch, to Gregor Müllegger for the initial tests, to SamBull for the suggestions, and to Jannis Leidel for the review and PEP8 cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-27 12:15:15 +00:00
Carl Meyer
75199e8f6d Fixed #16866 -- Clearer error message if empty list is passed to select_template. Thanks Silver_Ghost for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-21 14:20:18 +00:00
Julien Phalip
436aeb6e15 Fixed #16676 -- Corrected the behavior of the 'add' template filter to return an empty string instead of the given value unchanged in the case of an invalid use. Thanks to dtrebbien for the report and to Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 08:33:39 +00:00
Carl Meyer
4397c587a4 Fixed #16770 -- Eliminated TemplateSyntaxError wrapping of exceptions. Thanks to Justin Myles-Holmes for report and draft patch. 
Exceptions raised in templates were previously wrapped in TemplateSyntaxError
(in TEMPLATE_DEBUG mode only) in order to provide template source details on
the debug 500 page. The same debug information is now provided by annotating
exceptions rather than wrapping them. This makes catching exceptions raised
from templates more sane, as it's consistent in or out of DEBUG, and you can
catch the specific exception(s) you care about rather than having to also catch
TemplateSyntaxError and unwrap it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 01:16:25 +00:00
Ramiro Morales
26b8122087 Fixed #14675 -- Completed removal of from django.conf.urls.default import * usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Russell Keith-Magee
dc3b2a0fdf Fixed #16780 -- Removed a timing sensitive test from the template test suite. Thanks to Alex for the lend of his eyeballs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 17:54:04 +00:00
Jannis Leidel
3256862f5f Fixed #16717 -- Added ability to store result of trans template tag in context variable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-30 12:09:45 +00:00
Julien Phalip
bf9ba45f6b Fixed #16677 -- Fixed the future version of the ssi template tag to work with template file names that contain spaces. Note that this fix cannot be applied to the currently deprecated version of the ssi tag since it requires an unquoted literal as parameter. Many thanks to Aymeric Augustin for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-25 23:02:15 +00:00
Jannis Leidel
958e049d4d Fixed #5831 -- Made sure the ForNode reports the correct source of an exception happening in one of the loops. Thanks, Charmless and vladmos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:17 +00:00
Jannis Leidel
5fffe574bd Fixed #16326 -- Fixed re-pickling of unpickled TemplateResponse instances. Thanks, natrius and lrekucki. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:40:50 +00:00
Chris Beaven
34a71dc4e4 Add some simple regression tests for the truncatechars filter. Refs #16510. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-25 22:18:59 +00:00
Jannis Leidel
24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-13 09:35:51 +00:00
Jannis Leidel
38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-30 09:06:19 +00:00
Jannis Leidel
0ebaf10258 Fixed #11989 -- Allow passing a Template instance to inclusion_tag. Thanks to Jeremy Dunck and tcoenen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 16:22:45 +00:00
Jannis Leidel
d27f909d2e Fixed #12847 -- Added name parameter to simple_tag, assignment_tag and inclusion_tag helpers. Thanks, vladmos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 16:05:28 +00:00
Luke Plant
430b819967 Fixed #16196 - Redundant or incorrect code in tests 
Thanks to intelliyole and melinath for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-10 10:18:06 +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
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
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
0322f2b653 Fixed #15263 -- Added support for format localization to the now template tag. Thanks to danielr and dmclain. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 16:58:45 +00:00
Jannis Leidel
950e05c3ff Fixed #14262 -- Added new assignment_tag as a simple way to assign the result of a template tag to a context variable. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-03 11:52:42 +00:00
Jannis Leidel
2ac4f175ec Fixed #15070 -- Also pass current_app and use_l10n in inclusion_tags. Thanks, raony, mk and goodtune. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-28 13:41:28 +00:00
Luke Plant
1286d78311 Fixed #15791 - method to signal that callable objects should not be called in templates 
Thanks to ejucovy for the suggestion and patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-19 22:06:19 +00:00
Chris Beaven
d59baa07f0 Fixes #15721 -- Make {% include %} and RequestContext work together again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-17 04:52:31 +00:00
Chris Beaven
89e25403ae Fixes #15814 -- Added a test util to abstract the process of using a test template loader 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-17 04:52:17 +00:00
Russell Keith-Magee
4c468800ee Updates to the test suite to allow for newly deprecated and removed features 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-02 08:44:47 +00:00
Russell Keith-Magee
6eb1c58430 Added file mistakenly ommitted from r15819 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 09:30:01 +00:00
Russell Keith-Magee
c966566171 Fixed #14960 -- Added tests for inclusion tags. Thanks to Julien Phalip for the report, and to avenet and Paul Bissex for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 08:20:14 +00:00
Adrian Holovaty
4e25bc71b1 Fixed #15609 -- Fixed some 'raise' statements to use the newer style syntax. Thanks, DaNmarner 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-14 23:00:03 +00:00
Luke Plant
e9d2763947 Fixed #15572 - include with "only" option discards context properties (such as autoescape) 
Thanks to dfoerster for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-10 18:42:24 +00:00
Russell Keith-Magee
c260c533e1 Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-08 13:43:53 +00:00
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Russell Keith-Magee
edfed18581 Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 00:41:40 +00:00
Jannis Leidel
93cd8442fc Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError if an included variable can't be found in the context. Thanks, melinath. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-02 21:36:41 +00:00
Chris Beaven
1073a83f2c Ensure render_to_string leaves the context instance stack in the state it was originally passed in. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-20 04:55:11 +00:00