summaryrefslogtreecommitdiff
path: root/tests/regressiontests/templates
AgeCommit message (Collapse)Author
2010-02-21Fixed #5971 - Fixed inconsistent behaviour of the TokenParser when parsing ↵Jannis Leidel
filters that follow constant strings or variables. Thanks Dmitri Fedortchenko, Adam Vandenberg and Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21Fixed #7876 - Improved template error message to include expected end tag. ↵Jannis Leidel
Thanks to Matthias Kestenholz for the initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13Fixed #12613 -- Added Q and Z to the list of characters supported by the ↵Russell Keith-Magee
phone2numeric filter. Thanks to gabrielhurley for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-26Fixed #6587 -- Removed nasty __path__ hacking in templatetag loading. Thanks ↵Russell Keith-Magee
to Øyvind Satvik and Andrew Badr for their work on this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14Fixed #6262 -- Added a cached template loader, and modified existing ↵Russell Keith-Magee
template loaders and tag to be cacheable. Thanks to Mike Malone for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12Fixed #11972: Corrected title filter handling of numbers followed by ↵Karen Tracey
letters. Thanks schwank@gmail.com and Randy Barlow. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09Implemented 'smart if' template tag, allowing filters and various operators ↵Luke Plant
to be used in the 'if' tag Thanks to Chris Beaven for the initial patch, Fredrik Lundh for the basis of the parser methodology and Russell Keith-Magee for code reviews. There are some BACKWARDS INCOMPATIBILITIES in rare cases - in particular, if you were using the keywords 'and', 'or' or 'not' as variable names within the 'if' expression, which was previously allowed in some cases. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10Fixed #11833: name conflict in filter test.Luke Plant
Thanks steveire git-svn-id: http://code.djangoproject.com/svn/django/trunk@11492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18Fixed #11270 -- Modified cache template tag to prevent the creation of very ↵Russell Keith-Magee
long cache keys. Thanks to 235 for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to ↵Russell Keith-Magee
steveire for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code ↵Karen Tracey
comments. Thanks kaikuehne. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11Fixed #10369 -- Fixed auto-escaping inside "tran" and "blocktrans" tags.Malcolm Tredinnick
Patch from Andrew Badr. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10Fixed #9315 -- Handle spaces in URL tag arguments.Malcolm Tredinnick
Thanks Natalia Bidart and Matías Bordese for most of this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
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-04Fixed the test added for #9005 to use the e.args[0] instead of e.message. ↵Karen Tracey
Exceptions didn't have 'message' before Python 2.5, and it was deprecated as of Python 2.6. args[0] works without error or DeprecationWarning from Python 2.3 through 2.6. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10394 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 the test in [10351] to work reguardless of the test settings.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10355 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 #10667 -- Added missing sys import.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30Fixed #9065 -- Fixed the `timesince` and `timeuntil` template tags to work ↵Gary Wilson Jr
when both values involved are date objects, thanks to morty and mboersma for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10215 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 #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-30Made the template tests error output a bit more pretty.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-29Removed an inadvertent raise statement added in [8777] and added the ↵Gary Wilson Jr
printing of tracebacks for template tests that raise an unhandled exception. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10183 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 #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-23Removed an invalid template test (translating an empty string is a bad idea).Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10117 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-03-01Fixed a misnamed test that was inadvertently hiding an earlier one.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9929 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 #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-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-10-05Altered a failing url template tag test to work more reliably.Malcolm Tredinnick
There's no guarantee about the order in which ambiguous patterns are resolved. The solution is "don't do that" and avoid ambiguity. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31Fixed #8726 -- When doing reverse URL resolving, make sure we're consistentlyMalcolm Tredinnick
dealing with unicode strings throughout by promoting up from UTF-8 as necessary. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8777 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-31Added a couple of extra tests to ensure url tag robustness. These are anMalcolm Tredinnick
attempt to verify #8726. Refs #8726. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31A rewrite of the reverse URL parsing: the reverse() call and the "url" ↵Malcolm Tredinnick
template tag. This is fully backwards compatible, but it fixes a bunch of little bugs. Thanks to SmileyChris and Ilya Semenov for some early patches in this area that were incorporated into this change. Fixed #2977, #4915, #6934, #7206. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30Fixed #8710: removed a few stray tabs. Thanks, gkelly.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8746 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-25Because the filter tests take non-zero time to pass, it's possible for one ofMalcolm Tredinnick
the timeuntil tests to fail because the pre-recorded "now" has moved on sufficiently far from actual "now()". Fixed the one test that was failing for me (the other timeuntil and timesince tests already have a small buffer built in to guard against this problem). The problem was revealed after [8535]. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8556 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-25Fixed #7460 -- Made the "cache" template tag always generate keys that can beMalcolm Tredinnick
used with the memcache backend (which has the strongest restriction on keys). Based on a patch from trbs. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8533 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-23Corrected a test case error mistakenly committed in [8481].Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8482 bcc190cf-cafb-0310-a4f2-bffc1f526a37