summaryrefslogtreecommitdiff
path: root/django/template
AgeCommit message (Collapse)Author
2011-03-10Removed an unused code path.Luke Plant
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10Fixed #15572 - include with "only" option discards context properties (such ↵Luke Plant
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-08Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% ↵Russell Keith-Magee
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-03Fixed #11206 -- Ensure that the floatformat template filter doesn't switch ↵Ramiro Morales
to scientific notation when asked to format a zero value with more than six decimal places. Thanks Tai Lee for the report and fix and Facundo Batista for his help when Decimal module expertise was needed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are ↵Russell Keith-Magee
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-03Fixed #15530 -- Corrected typo in template loader deprecation message. ↵Russell Keith-Magee
Thanks to msaelices for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27Fixed #15368 - test failures due to regression with RequestContextLuke Plant
Thanks to cyberdelia for the reports on this. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21Fix broken tests due to changes in r15591 by updating the test ↵Chris Beaven
store_rendered_templates signal handler. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20Ensure render_to_string leaves the context instance stack in the state it ↵Chris Beaven
was originally passed in. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04Fixed #14046 -- Made {% include %} behave the same, regardless of whether ↵Russell Keith-Magee
the template included is named by variable or constant string. Thanks to defcube for the report, and George Karpenkov for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26Fixed #15157 -- Modified evaluation of literals surrounded by _(' and ')' in ↵Ramiro Morales
templates to be evaluated at render time instead of at compile time by using ugettext_lazy. Thanks Jonathan S for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26Fixed #13828 -- DRY'd up the dictsort(reversed) filters, will speed them up ↵Alex Gaynor
as well. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24Fixed #15012 -- Added post-rendering callbacks to TemplateResponse so that ↵Russell Keith-Magee
decorators (in particular, the cache decorator) can defer processing until after rendering has occurred. Thanks to Joshua Ginsberg for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24Fixed #14240 -- Enabled localization for the filesize filter. Thanks to ↵Russell Keith-Magee
David Danier for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05Fixed #15010 -- Added current_app parameter to close gap between ↵Jannis Leidel
TemplateResponse and render method. Thanks, acdha. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02Fixed #2986 -- Made the JavaScript code that drives related model instance ↵Ramiro Morales
addition in a popup window handle a model representation containing new lines. Also, moved the escapejs functionality yoo django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19Fixed #7153 -- _resolve_lookup now does a better job of resolving callables ↵Chris Beaven
and correctly catches all silent_variable_exceptions git-svn-id: http://code.djangoproject.com/svn/django/trunk@14992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to ↵Russell Keith-Magee
Julien Phalip for driving the issue and providing the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18Fixes #7817 and #9456.Chris Beaven
- The include tag now has a 'with' option to include to provide extra context vairables to the included template. - The include tag now has an 'only' option to exclude the current context when rendering the included template. - The with tag now accepts multiple variable assignments. - The with, include and blocktrans tags now use a new keyword argument format for variable assignments (e.g. `{% with foo=1 bar=2 %}`). git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-16Fixed #2411 -- Fixed some XHTML validation errors in admindocs pages. Thanks ↵Ramiro Morales
to James Wheare for the report and to Simon Greenhill for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-07Fixed #12815 -- Added TemplateResponse, a lazy-evaluated Response class. ↵Russell Keith-Magee
Thanks to Simon Willison for the original idea, and to Mikhail Korobov and Ivan Sagalaev for their assistance, including the draft patch from Mikhail. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04Fixed #12201 -- Added a lineno attibute to template Token so e.g. we can ↵Ramiro Morales
report line numbers in errors during i18n literals extraction. Thanks madewulf for the report and Claude Paroz for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27Fixed #12248 -- Refactored django.template to get code out of __init__.py, ↵Russell Keith-Magee
to help with avoiding circular import dependencies. Thanks to Tom Tobin for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24Fixes #3529 -- more explicit documentation about Context.update. Thanks for ↵Chris Beaven
the patch, ggetzie. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21Fixed #4552 -- minor tidy up of the {% for %} tag's comma splittingChris Beaven
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20Fixed #14389, #9666 -- Started the migration path to make the first argument ↵Russell Keith-Magee
to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17Fixed #10004 and #12320 -- Enabled the makemessages management command to ↵Jannis Leidel
collect comments for translators that start with the "Translators" keyword. Thanks for the report and patches, martinb and Claude Paroz. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02Fixed #13567 -- Added a 'silent' argument to the cycle tag, so that you can ↵Russell Keith-Magee
declare a cycle without producing a value in the template. Thanks to anentropic for the suggestion and initial patch, and Łukasz Rekucki for the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-30Fixed #14589 -- Corrected a copy-and-paste error introduced in r14395. ↵Russell Keith-Magee
Thanks to Adam McKerlie for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-29Fixed #14181 -- Added a template tag and filters to allow localization to be ↵Russell Keith-Magee
disabled in a template. Thanks to Benjamin Wohlwend for the work on the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to ↵Russell Keith-Magee
DeprecationWarnings, and removed 1.1 deprecated code. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13Fixed #13765 - 'safe' parameter for urlencode filterLuke Plant
Thanks to KyleMac for the suggestion and SmileyChris for the patch git-svn-id: http://code.djangoproject.com/svn/django/trunk@13849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13Fixed #12965 - unordered_list template filter fails when given a ↵Luke Plant
non-iterable second item in a two item list Thanks to grahamu for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10Fixed #14235 - UnicodeDecodeError in CSRF middlewareLuke Plant
Thanks to jbg for the report. This changeset essentially backs out [13698] in favour of a method that sanitizes the token rather than escaping it. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09Patch CSRF-protection system to deal with reported security issue. ↵James Bennett
Announcement and details to follow. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07Fixed #13475 - for tag raises an exception when trying to unpack a ↵Luke Plant
non-iterable item Thanks to SmileyChris for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-16Fixed #14002 -- Modified filesize filter to ensure strings are translatable. ↵Russell Keith-Magee
Thanks to claudep for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14Fixed #14002 -- Updated filesize filter to support terabyte and petabyte ↵Russell Keith-Magee
file sizes. Thanks to Aaron T. Myers for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07Fixed #11021 -- Clarified newline stripping behavior in the truncatewords ↵Russell Keith-Magee
and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03Fixed #11377: the template join filter now correctly escapes the joiner, too.Jacob Kaplan-Moss
Thanks, Stephen Kelly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21Refs #13573 -- Modified the key technique added in r13295 to be more robust ↵Russell Keith-Magee
against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21Fixed #13573 -- Corrected problem with template caching when template ↵Russell Keith-Magee
directories are provided. Thanks to lamby for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04Fixed #12164 -- Removed the Python 2.3 compatibility imports and ↵Russell Keith-Magee
workarounds. Thanks to timo and claudep for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19Fixed #13373 -- Ensured that {% if %} statements will short circuit template ↵Russell Keith-Magee
logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15Fixed #13334: Restored ability to load template tags from eggs. Again thanks ↵Karen Tracey
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-12Refs #13167 -- Corrected a regression in the way non-existent variables are ↵Russell Keith-Magee
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-11Fixed #13311 -- Modified the tag library import process so it doesn't mask ↵Russell Keith-Magee
import errors in the tag library itself. Thanks to amccurdy for the report, and Alex Gaynor for the suggested fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-10Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid ↵Russell Keith-Magee
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-03-30Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the ↵Russell Keith-Magee
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-22Fixed #12554 again: Corrected regression in silencing attribute lookups ↵Karen Tracey
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