mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Code Issues 30 Releases Wiki Activity
10,379 Commits 28 Branches 426 Tags 680 MiB
909e002808
Commit Graph

190 Commits

Author SHA1 Message Date
Karen Tracey
a288f97a2a Add file mistakenly left out of r12986. Refs #13334. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 20:36:00 +00:00
Karen Tracey
da36e32224 Fixed #13334: Restored ability to load template tags from eggs. Again thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule, and Russ for review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 19:57:09 +00:00
Russell Keith-Magee
2cebe4395e Refs #13167 -- Corrected a regression in the way non-existent variables are handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 13:56:38 +00:00
Russell Keith-Magee
b579350cd1 Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid catastrophic backtracking. Thanks to SmileyChris for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-10 07:35:31 +00:00
Russell Keith-Magee
dafc077e4a Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072. Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-30 12:44:30 +00:00
Karen Tracey
ed36a5f2ce Fixed #12554 again: Corrected regression in silencing attribute lookups introduced in r12823, plus added a test for this so it doesn't regress again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-22 19:08:04 +00:00
Karen Tracey
2403f581b3 Fixed #12554: Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 20:27:57 +00:00
Karen Tracey
80e744945c Fixed #12787: Correctly identify the template that does not exist when a template being extended includes another template that does not exist. Thanks to trigeek38 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-16 14:34:57 +00:00
Russell Keith-Magee
beca4b8109 Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-15 07:22:20 +00:00
Luke Plant
960af90279 Fixed #13058 - "smart if" template tag doesn't support "if not in ..." condition 
Thanks to ramusus for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 23:25:37 +00:00
Karen Tracey
50e46c017e Fixed #11461: Ensured complete traceback is available on the debug page when an exception is encountered during template rendering, even when running on Python 2.6 or higher. Thanks Glenn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 17:01:21 +00:00
Russell Keith-Magee
f034c79cbc Fixed #6510 -- Refactored the way child nodes are found in template nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 07:42:51 +00:00
Karen Tracey
698410ab6f Fixed #12992: Adjusted the new template loader code so that the template 
file name is correctly reported on the debug page when a template syntax
error is raised.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 23:05:35 +00:00
Joseph Kocherhans
fd233f40d1 Fixed #12070. Fixed a case where var._whatever wasn't raising a TemplateSyntaxError. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 18:50:57 +00:00
Justin Bronn
349827996b Fixed #12072 -- Certain characters no longer break url tag. Thanks, Alexander Dutton. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 05:17:39 +00:00
Jacob Kaplan-Moss
c1d795df45 Clarified a comment from [11687]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:42:53 +00:00
Jacob Kaplan-Moss
49d6a82261 Fixed #11687: the add filter is now less failsome when faced with things that can't be coerced to integers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:34:33 +00:00
Jannis Leidel
84f8213d74 Fixed #5972 - Allow the template filters to be used with the trans tag. Thanks for the initial patch, Dmitri Fedortchenko. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:43:28 +00:00
Jannis Leidel
b459f5b7e3 Fixed #5971 - Fixed inconsistent behaviour of the TokenParser when parsing 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-21 23:42:57 +00:00
Jannis Leidel
6cafd4b21f Fixed #7876 - Improved template error message to include expected end tag. 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-21 23:38:33 +00:00
Russell Keith-Magee
0e5836dc07 Fixed #12613 -- Added Q and Z to the list of characters supported by the 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-02-13 14:36:21 +00:00
Russell Keith-Magee
12d3799dd2 Fixed #6587 -- Removed nasty __path__ hacking in templatetag loading. Thanks 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
 2010-01-26 01:38:50 +00:00
Russell Keith-Magee
44b9076bbe Fixed #6262 -- Added a cached template loader, and modified existing 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-14 12:08:23 +00:00
Karen Tracey
f761802b22 Fixed #11972: Corrected title filter handling of numbers followed by 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-12 17:20:32 +00:00
Luke Plant
2c2f5aee4d Implemented 'smart if' template tag, allowing filters and various operators 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-12-09 22:40:36 +00:00
Luke Plant
a2b46ca5fd Fixed #11833: name conflict in filter test. 
Thanks steveire



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-10 16:35:23 +00:00
Russell Keith-Magee
cbbe60c7fc Fixed #11270 -- Modified cache template tag to prevent the creation of very 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-18 15:04:00 +00:00
Russell Keith-Magee
8950a40cec Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to steveire for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 15:03:17 +00:00
Karen Tracey
50745cc31e Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:45:28 +00:00
Malcolm Tredinnick
b1a5db37e6 Fixed #10369 -- Fixed auto-escaping inside "tran" and "blocktrans" tags. 
Patch from Andrew Badr.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-11 12:03:52 +00:00
Malcolm Tredinnick
be4a83c448 Fixed #9315 -- Handle spaces in URL tag arguments. 
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-10 04:13:27 +00:00
Jacob Kaplan-Moss
6d6bbb6d05 Fixed #9756: the for tag no longer leaves the context stack unbalanced when 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-07 22:02:34 +00:00
Karen Tracey
63143d5d9d Fixed the test added for #9005 to use the e.args[0] instead of e.message. 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-04 19:34:52 +00:00
Jacob Kaplan-Moss
9828557731 Fixed #9520: make the date filter fail silently for non-date values. Thanks, Andrew Badr and Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 05:20:25 +00:00
Jacob Kaplan-Moss
751234bfd9 Fixed the test in [10351] to work reguardless of the test settings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 01:40:56 +00:00
Brian Rosner
64e82fb648 Fixed #10043 -- widthratio tag now accepts a variable for the max_width 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-01 23:41:36 +00:00
Jacob Kaplan-Moss
624caace17 Fixed #9005: don't wig out when reversing a URL if SETTINGS_MODULE isn't 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-04-01 22:46:46 +00:00
Gary Wilson Jr
7805afffd7 Fixed #10667 -- Added missing sys import. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 07:23:50 +00:00
Gary Wilson Jr
3e7f5131a5 Fixed #9065 -- Fixed the timesince and timeuntil template tags to work 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-30 21:32:34 +00:00
Gary Wilson Jr
86c5142461 Fixed #10094 -- Fixed the include and extends template tags to work with filenames with spaces, patch from mcroydon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-30 20:30:28 +00:00
Gary Wilson Jr
432f7f624a Fixed #8462 -- Made length and length_is template filters fail silently 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-30 16:46:27 +00:00
Gary Wilson Jr
a6d7b418de Made the template tests error output a bit more pretty. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-30 16:05:57 +00:00
Gary Wilson Jr
4a9b1f7a36 Removed an inadvertent raise statement added in [8777] and added the 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-29 23:33:01 +00:00
Malcolm Tredinnick
2c6c60cec6 Template filters now pass numerical arguments through as numbers. 
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-25 03:45:56 +00:00
Malcolm Tredinnick
7db24dd2b0 Fixed #5756, #6296 -- Most template tags can now handle filters in arguments. 
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-23 09:42:51 +00:00
Malcolm Tredinnick
a6f429e37e Added consistent support for double- and single-quote delimiters in templates. 
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-23 09:40:25 +00:00
Malcolm Tredinnick
f5c07f89e3 Removed an invalid template test (translating an empty string is a bad idea). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-23 09:19:45 +00:00
Malcolm Tredinnick
dfddf129f0 Fixed #9701 -- Added a "safeseq" template filter. 
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-02 08:16:33 +00:00
Malcolm Tredinnick
152d517878 Fixed a misnamed test that was inadvertently hiding an earlier one. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-01 06:54:38 +00:00
Jacob Kaplan-Moss
bd2b0059be Here's the rest of [9530] where I actually rename the tag like I said I did. 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-24 22:33:32 +00:00
Jacob Kaplan-Moss
4aa97f5c18 Fixed #6398: added an optional {% empty %} clause to the {% for %} 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-24 22:01:48 +00:00
Malcolm Tredinnick
0349d83289 Fixed #6948 -- The join filter was escaping the literal value that was 
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-15 01:16:20 +00:00
Karen Tracey
2026934600 Fixed #8966 -- Changed is_safe for length_is filter to False, since its 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-28 19:00:49 +00:00
Malcolm Tredinnick
8fb1459b52 Added some better error reporting and path handling when creating template 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-06 06:34:54 +00:00
Malcolm Tredinnick
d343aa3022 Altered a failing url template tag test to work more reliably. 
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-10-05 04:59:55 +00:00
Malcolm Tredinnick
7838493b9e Fixed #8726 -- When doing reverse URL resolving, make sure we're consistently 
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-31 22:47:25 +00:00
Jacob Kaplan-Moss
86316f0be6 Fixed #7027: template tags now corectly break tokens around strings marked for translation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 18:28:06 +00:00
Malcolm Tredinnick
6390155f5c Added a couple of extra tests to ensure url tag robustness. These are an 
attempt to verify #8726.

Refs #8726.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 17:29:49 +00:00
Malcolm Tredinnick
a63a83e5d8 A rewrite of the reverse URL parsing: the reverse() call and the "url" 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-31 11:11:20 +00:00
Jacob Kaplan-Moss
f2d7ee759a Fixed #8710: removed a few stray tabs. Thanks, gkelly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 19:25:40 +00:00
Jacob Kaplan-Moss
c068bc184c Merge branch 'url-tag-asvar' 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:28:03 +00:00
Malcolm Tredinnick
3111d7f60b Fixed #7201 -- Fixed the timeuntil filter to work correctly with timezone-aware 
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-26 08:08:55 +00:00
Malcolm Tredinnick
8c4a525871 Fixed #7177 -- Added extra robustness to the escapejs filter so that all 
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-26 07:56:32 +00:00
Malcolm Tredinnick
b46e736c9a Because the filter tests take non-zero time to pass, it's possible for one of 
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-25 20:47:42 +00:00
Russell Keith-Magee
06d49768bd Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after 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-25 12:31:10 +00:00
Malcolm Tredinnick
c46bb219bf Fixed #7460 -- Made the "cache" template tag always generate keys that can be 
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-25 04:52:55 +00:00
Russell Keith-Magee
67402a6fb5 Reverted [8481] and [8482] while we work out what is going on with #8453 and 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-23 15:03:40 +00:00
Russell Keith-Magee
b35acb3ee9 Corrected a test case error mistakenly committed in [8481]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 13:14:10 +00:00
Russell Keith-Magee
46da8ac9e5 Fixed #7443: 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@8481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 12:52:04 +00:00
Gary Wilson Jr
6d863fef8a Fixed #5270 -- Allow template tags and filters to accept an emtpy string, patch from jdunck. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-15 21:08:11 +00:00
Luke Plant
c768bc6f25 Fixed #8031 - url tag no longer silences NoReverseMatch exceptions since this is very rarely useful 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-05 14:16:13 +00:00
Malcolm Tredinnick
f752f69238 Fixed #7767 -- Fixed template egg loading test for Windows systems. 
Thanks, Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 06:05:15 +00:00
Malcolm Tredinnick
e29aece743 Fixed #4534 -- Added an "else" option to the "ifchanged" template tag. 
Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 22:09:43 +00:00
Adrian Holovaty
74f0408fa2 Fixed #6201 -- Improved the {% cache %} template tag to allow the timeout to be a template variable. Inspired by the patch by zz and edrik 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 04:54:10 +00:00
Adrian Holovaty
5ee4a099f1 Fixed infuriating lack of apostrophe in a comment 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 04:33:18 +00:00
Adrian Holovaty
dbde7fc8b0 Fixed #6322 -- Fixed bug in 'ifchanged' template tag where it wasn't 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-26 04:30:06 +00:00
Adrian Holovaty
65437a95e1 Improved our tests so that they don't raise an error if setuptools isn't installed, hence ridding the test suite of all dependencies. Also updated docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 04:25:40 +00:00
Adrian Holovaty
345a096756 Negligible formatting changes to tests/regressiontests/templates/loaders.py 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 04:22:12 +00:00
Russell Keith-Magee
4317ba5799 Fixed #7318 -- Cleaned up the template inheritance logic, specifically to 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-18 12:59:39 +00:00
Jacob Kaplan-Moss
08d468db92 Fixed a messy test case (regressiontests/templates/loaders) that could cause future tests to fail by not cleaning up after itself. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-30 23:24:23 +00:00
Russell Keith-Magee
d53e8f1285 Fixed #6430 -- Corrected the loading of templates from eggs, which was 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-29 13:11:23 +00:00
Malcolm Tredinnick
0c4ea9b922 Fixed #6279, #6514 -- Fixed some HTML escaping problems in the urlize filter. 
Based on a patch from SmileyChris with some test additions from Rob Hudson.
Thanks, both.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-03 08:54:26 +00:00
Malcolm Tredinnick
d18a114f86 Fixed #6326 -- Made the test for translations of filter arguments test something that has a chance of failure. Thanks akaihola. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-03 01:49:55 +00:00
Malcolm Tredinnick
a7da12d320 Fixed #5567 -- Added a "last" filter. Based on a patch from darkpixel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-06 03:53:33 +00:00
Adrian Holovaty
3d52ce730f Reverted 'regroup' template tag changes from [6956], as they caused bug #6271, which affects one of my sites. I don't have time to inspect the #6271 patch, so I'm reverting this change in the interim, to fix the bug immediately. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-05 00:03:12 +00:00
Adrian Holovaty
293f0f2360 Fixed #6295 -- Made the {% for %} tag a bit more efficient by creating a single context dictionary rather than recreating it each time through the loop. Thanks, Ned Batchelder 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-02 05:01:03 +00:00
Gary Wilson Jr
d1b5a0bde5 Removed some reverse string craziness from the regroup template tag argument checking and added a few syntax tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-19 06:11:55 +00:00
Malcolm Tredinnick
367867845f Fixed #6239 -- Fixed an auto-escaping problem with urlizetrunc. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-19 04:20:02 +00:00
Malcolm Tredinnick
67373009e0 Fixed #4563 -- Context.pop/push/update return the top-level dictionary (the new 
one for push() and update(), the one removed for pop()). Based on a patch from
Brian Harring.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 23:57:22 +00:00
Malcolm Tredinnick
8de4ed9c8c Fixed #6057 -- Mark rendered template output as safe for auto-escaping purposes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-30 15:32:01 +00:00
Malcolm Tredinnick
3c272792d6 Added tests and a small optimisation for [6721]. Thanks SmileyChris. Fixed #6049 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-29 01:44:30 +00:00
Malcolm Tredinnick
9130765ff9 Fixed #5890 -- fixed the far edge-case of allowing constant strings inside 
template template markers: we now treat embedded, escaped double quotes
consistently with constant string arguments to filters. Patch from Dmitri
Fedortchenko.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-28 21:04:05 +00:00
Malcolm Tredinnick
2e9e36e297 Fixed #5983 -- Made iriencode filter respect safe strings. Patch from 
SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-20 01:37:57 +00:00
Malcolm Tredinnick
5f8cfe99f3 Fixed #5969 -- Corrected a problem introduced in [6682]. 
*sigh* As usual, the one case I forget to test turned out to be broken.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-18 03:36:03 +00:00
Malcolm Tredinnick
4bd75e8712 Fixed a couple of chained filter tests that weren't demonstrating what they 
claimed (since the "cut" filter's behaviour had changed since I originally
wrote those tests).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-17 12:18:09 +00:00
Malcolm Tredinnick
4585b4d6c2 Fixed some missed auto-escaping and URL quoting cases in the urlize filter. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-17 12:12:40 +00:00
Malcolm Tredinnick
adcec0885d Fixed a few problems with variable resolving inside of blocktrans tags. A couple of these were exposed by the auto-escaping changes, but I suspect the other one has been hiding in plain sight for a while. 
Fixed #5952, #5953


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-17 12:12:18 +00:00
Malcolm Tredinnick
0928fa5566 Fixed #5945 -- Treat string literals in template filter arguments as safe 
strings for auto-escaping purposes.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-17 12:11:26 +00:00
Malcolm Tredinnick
0b0ef3f0c5 Fixed #4713 -- Fixed handling of _() in template tag arguments. Based on 
patched from Indy and SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-17 04:04:12 +00:00
Malcolm Tredinnick
bdb0b903c2 Content coming via {{ block.super }} is always going to be correctly escaped 
already. We mark it as safe so that template authors don't need to.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 21:07:27 +00:00