summaryrefslogtreecommitdiff
path: root/django/template
AgeCommit message (Collapse)Author
2009-04-07Fixed #9756: the for tag no longer leaves the context stack unbalanced when ↵Jacob Kaplan-Moss
dealing with an empty iterable. Thanks, seanl. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07Fixed #10644: removed an undocumented, unused, and (as far as I can tell) ↵Jacob Kaplan-Moss
unnecessary "feature" of the ifchanged tag. Thanks, akaihola. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-02Fixed #9520: make the date filter fail silently for non-date values. Thanks, ↵Jacob Kaplan-Moss
Andrew Badr and Eric Holscher. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-02Fixed #10053: the most exciting commit you'll ever see.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-01Fixed #10043 -- widthratio tag now accepts a variable for the max_width ↵Brian Rosner
argument. The max_width argument now passes through FilterExpression which by side-affect allows float values, but will be truncated. Thanks obeattie and Eric Holscher for patches. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-01Fixed #9005: don't wig out when reversing a URL if SETTINGS_MODULE isn't ↵Jacob Kaplan-Moss
set. While I was there, I fixed #10599 by re-raising the original error message, which is almost always a better idea. Thanks, Eric git-svn-id: http://code.djangoproject.com/svn/django/trunk@10350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31Fixed #10513: floatformat now works with floatish things, not just real ↵Jacob Kaplan-Moss
floats. Thanks, Alex. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30Fixed #10094 -- Fixed the `include` and `extends` template tags to work with ↵Gary Wilson Jr
filenames with spaces, patch from mcroydon. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30Fixed #10079 -- Moved settings import inside the function that uses it so ↵Gary Wilson Jr
that the module can be imported without needing settings, thanks kcarnold and mcroydon. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30Fixed #8462 -- Made `length` and `length_is` template filters fail silently ↵Gary Wilson Jr
when given a value that has undefined length and added tests for both filters. Based on patch from marcelor, rob, and SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-25Template filters now pass numerical arguments through as numbers.Malcolm Tredinnick
This was the (undocumented) behaviour prior to r10118 and now it's back again. It's neither hard nor harmful to maintain compatibility with the old ways. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23Fixed an error in the `firstof` template tag when used with ↵Jacob Kaplan-Moss
`TEMPLATE_STRING_IF_INVALID`. Thanks to Alex Gaynor for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23Fixed #5756, #6296 -- Most template tags can now handle filters in arguments.Malcolm Tredinnick
Most of the hard work for this was done by akaihola. There are still possibly some problems with the i18n template tags, since they are written quite differently and a few other bug fixes have to made before they can be fixed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23Added consistent support for double- and single-quote delimiters in templates.Malcolm Tredinnick
Some template filters and tags understood single-quoted arguments, others didn't. This makes everything consistent. Based on a patch from akaihola. Fixed #7295. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-18Fixed #8193: all dynamic imports in Django are now done correctly. I know ↵Jacob Kaplan-Moss
this because Brett Cannon borrowed the time machine and brought Python 2.7's '`importlib` back for inclusion in Django. Thanks for the patch-from-the-future, Brett! git-svn-id: http://code.djangoproject.com/svn/django/trunk@10088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Fixed #9701 -- Added a "safeseq" template filter.Malcolm Tredinnick
This is like "safe", except it operates on the individual elements of a sequence, rather than treating the whole argument as a string. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16Fixed #10014 -- Don't crash when using debug template tag inside a block ↵Malcolm Tredinnick
node tag. Returning non-ASCII characters from TextNode.__repr__ was causing problems in the BlockNode.__repr__ method (and probably in other places we don't know about yet). We now forcibly convert to ascii and replace any unconvertible characters, rather than returning some moderately corrupted data in the non-ASCII case. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24Here's the rest of [9530] where I actually rename the tag like I said I did. ↵Jacob Kaplan-Moss
I swear this was git's fault, not mine. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-24Fixed #6398: added an optional `{% empty %}` clause to the `{% for %}` ↵Jacob Kaplan-Moss
template tag. The contents of this clause are rendered if the list iterated over turns out to be empty. Thanks, Jannis Leidel. Astute readers will notice that the patch originally called this `default`; after consideration I decided that `empty` is a very slightly better color for this particular bikeshed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-15Fixed a bug introduced in r9422.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-15Fixed #6948 -- The join filter was escaping the literal value that wasMalcolm Tredinnick
passed in for the connector. This was contrary to what the documentation for autoescaping said and to what every other filter does with literal strings as arguments. This is backwards incompatible for the situation of the literal string containing one of the five special HTML characters: if you were writing {{ foo|join:"&" }}, you now have to write {{ foo| join:"&" }}. Previous behaviour was, as noted, a bug and contrary to what was documented and expected. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-13Fixed #9579 -- Properly handle apps running with (and specifically, loading ↵Karen Tracey
templates from) a current working directory path that contains non-ASCII characters. Thanks for the report to gonzalodelgado and for advice on how to fix it to Daniel Pope. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-08Fixed #5748 -- Made floatformat filter round properly on all platforms and ↵Karen Tracey
handle NaN input correctly on Windows. Also added tests for these cases. Thanks for the report and initial patch to SmileyChris and PJCrosier. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28Fixed #8966 -- Changed is_safe for length_is filter to False, since its ↵Karen Tracey
return value is a boolean, not a string. Thanks Thomas Steinacher and carljm. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06Added some better error reporting and path handling when creating template ↵Malcolm Tredinnick
paths. We now raise UnicodeDecodeError for non-UTF-8 bytestrings (thanks to Daniel Pope for diagnosing this was being swallowed by ValueError) and allow UTF-8 bytestrings as template directories. Refs #8965. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31Fixed #7027: template tags now corectly break tokens around strings marked ↵Jacob Kaplan-Moss
for translation. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29Merge branch 'url-tag-asvar'Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Fixed #7201 -- Fixed the timeuntil filter to work correctly with timezone-awareMalcolm Tredinnick
times. Patch from Jeremy Carbaugh. This is backwards incompatible in the sense that previously, if you tried to compare timezone-aware and timezone-naive values, you got an incorrect result. Now you get an empty string. So your previously incorrect code returns a different incorrect result. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Fixed #7177 -- Added extra robustness to the escapejs filter so that allMalcolm Tredinnick
invalid characters are correctly escaped. This avoids any chance to inject raw HTML inside <script> tags. Thanks to Mike Wiacek for the patch and Collin Grady for the tests. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after ↵Russell Keith-Magee
confirmation from Malcolm. Corrected a long standing mistake in the timesince/timeuntil filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23Reverted [8481] and [8482] while we work out what is going on with #8453 and ↵Russell Keith-Magee
the related discussions that I wasn't previously aware of. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23Fixed #7443: Corrected a long standing mistake in the timesince/timeuntil ↵Russell Keith-Magee
filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15Fixed #5270 -- Allow template tags and filters to accept an emtpy string, ↵Gary Wilson Jr
patch from jdunck. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-05Fixed #8031 - url tag no longer silences NoReverseMatch exceptions since ↵Luke Plant
this is very rarely useful git-svn-id: http://code.djangoproject.com/svn/django/trunk@8211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01Fixed #3912 - Added simple type checking to template.Context.update() to ↵Luke Plant
help debugging broken context processors. Thanks Jeremy Dunck git-svn-id: http://code.djangoproject.com/svn/django/trunk@8181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-26Fixed #4534 -- Added an "else" option to the "ifchanged" template tag.Malcolm Tredinnick
Patch from SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Fixed #7417 -- Fixed ReST error in do_if() docstring. Thanks, Richard Bell ↵Adrian Holovaty
<rbell01824@earthlink.net> git-svn-id: http://code.djangoproject.com/svn/django/trunk@7758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Optimized {% cycle %} template tag so that it creates the Variable objects ↵Adrian Holovaty
in CycleNode.__init__() rather than each time render() is called git-svn-id: http://code.djangoproject.com/svn/django/trunk@7756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Fixed #6322 -- Fixed bug in 'ifchanged' template tag where it wasn't ↵Adrian Holovaty
resetting itself properly in some cases. Thanks, nedbatchelder git-svn-id: http://code.djangoproject.com/svn/django/trunk@7752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-18Fixed #7318 -- Cleaned up the template inheritance logic, specifically to ↵Russell Keith-Magee
handle the case where the parent template has no template tags/blocks. Took the opportunity to optimize the logic a little. Thanks to Matthias Kestenholz <mk@spinlock.ch> for the original report and test case. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-06Fixed #7293 -- Corrected some doctests strings internal to the template ↵Russell Keith-Magee
module. Thanks, akaihola. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-29Fixed #6430 -- Corrected the loading of templates from eggs, which was ↵Russell Keith-Magee
broken by the unicode merge. Thanks for the excellent report and patch, Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-29Fixed #6950 -- Modified initialization of template loaders to use a ↵Russell Keith-Magee
temporary variable instead of directly modifying the global loader list. Thanks, mrts. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-29Fixed #7301 -- Corrected minor typo in docstring. Thanks, micahcowan.Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-20FIxed #6513 -- Handle overflows better in the floatformat filter. It's notMalcolm Tredinnick
possible to test this automatically everywhere due to differing representations on different platforms. Manual testing confirms it works, though. Thanks, Karen Tracey. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-17Fixed #5884 -- Added better display error handling for template variables.Malcolm Tredinnick
Combined work from Karen Tracey and Thomas Güttler. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-25Fixed #5701 -- Fixed decorators to take the name, attributes, and docstring ↵Gary Wilson Jr
of the function they decorate by adding a modified version of the `functools.wraps` function from Python 2.5. `wraps` has been altered to work with Django's `curry` function and with Python 2.3, which doesn't allow assignment of a function's `__name__` attribute. This fixes severaly annoyances, such as the online documentation for template filters served by the admin app. This change is backwards incompatible if, for some reason, you were relying on the name of a Django decorator instead of the function it decorates. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-05Tweaked [7082] and [7084] a little bit to also allow comment nodes prior to ↵Malcolm Tredinnick
the extends tag. This would be little less fiddly if we knew nodelist were always of type NodeList, but they could be normal lists. Or if we merged successive TextNodes, instead of appending them. Something to think about going forwards. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-04Fixed a simple TODO item in one error path of the "extends" tag.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-04Fixed #5124 -- Added a reasonable error when "extends" is not the first ↵Malcolm Tredinnick
template tag. Patch from k0001. Refs #6274. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
generated by cgit v1.3 (git 2.53.0) at 2026-08-21 09:47:44 +0000