<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[284] sites/trunk/trac.wordpress.org/patches/upstream-changeset-11533.diff: Trac: Add patch that applies http://trac.edgewall.org/changeset/11533 (dynamic variables in report titles and descriptions), which was shipped in Trac 1.1.1.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/284">284</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-12 10:05:03 +0000 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trac: Add patch that applies http://trac.edgewall.org/changeset/11533 (dynamic variables in report titles and descriptions), which was shipped in Trac 1.1.1.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunktracwordpressorgpatchesupstreamchangeset11533diff">sites/trunk/trac.wordpress.org/patches/upstream-changeset-11533.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktracwordpressorgpatchesupstreamchangeset11533diff"></a>
<div class="addfile"><h4>Added: sites/trunk/trac.wordpress.org/patches/upstream-changeset-11533.diff (0 => 284)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/trac.wordpress.org/patches/upstream-changeset-11533.diff (rev 0)
+++ sites/trunk/trac.wordpress.org/patches/upstream-changeset-11533.diff 2014-01-12 10:05:03 UTC (rev 284)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+Index: trac/ticket/report.py
+===================================================================
+--- trac/ticket/report.py (revision 12423)
++++ trac/ticket/report.py (working copy)
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ #
+-# Copyright (C) 2003-2009 Edgewall Software
++# Copyright (C) 2003-2013 Edgewall Software
+ # Copyright (C) 2003-2004 Jonas Borgström <jonas@edgewall.com>
+ # Copyright (C) 2006 Christian Boos <cboos@edgewall.org>
+ # Copyright (C) 2006 Matthew Good <trac@matt-good.net>
+@@ -33,7 +33,8 @@
+ from trac.util import as_int, content_disposition
+ from trac.util.datefmt import format_datetime, format_time, from_utimestamp
+ from trac.util.presentation import Paginator
+-from trac.util.text import exception_to_unicode, to_unicode, quote_query_string
++from trac.util.text import (exception_to_unicode, quote_query_string, sub_vars,
++ sub_vars_re, to_unicode)
+ from trac.util.translation import _, tag_
+ from trac.web.api import IRequestHandler, RequestDone
+ from trac.web.chrome import (INavigationContributor, Chrome,
+@@ -43,7 +44,6 @@
+ from trac.wiki import IWikiSyntaxProvider, WikiParser
+
+
+-
+ SORT_COLUMN = '@SORT_COLUMN@'
+ LIMIT_OFFSET = '@LIMIT_OFFSET@'
+
+@@ -107,7 +107,6 @@
+ return sql, '' # no single clause separator
+
+
+-
+ class ReportModule(Component):
+
+ implements(INavigationContributor, IPermissionRequestor, IRequestHandler,
+@@ -424,7 +423,8 @@
+ data = {'action': 'view',
+ 'report': {'id': id, 'resource': report_resource},
+ 'context': context,
+- 'title': title, 'description': description,
++ 'title': sub_vars(title, args),
++ 'description': sub_vars(description, args),
+ 'max': limit, 'args': args, 'show_args_form': False,
+ 'message': None, 'paginator': None,
+ 'report_href': report_href,
+@@ -798,8 +798,6 @@
+ missing_args.append(aname)
+ values.append(arg)
+
+- var_re = re.compile("[$]([A-Z_][A-Z0-9_]*)")
+-
+ # simple parameter substitution outside literal
+ def repl(match):
+ add_value(match.group(1))
+@@ -807,7 +805,7 @@
+
+ # inside a literal break it and concatenate with the parameter
+ def repl_literal(expr):
+- parts = var_re.split(expr[1:-1])
++ parts = sub_vars_re.split(expr[1:-1])
+ if len(parts) == 1:
+ return expr
+ params = parts[1::2]
+@@ -825,7 +823,7 @@
+ if expr.startswith("'"):
+ sql_io.write(repl_literal(expr))
+ else:
+- sql_io.write(var_re.sub(repl, expr))
++ sql_io.write(sub_vars_re.sub(repl, expr))
+
+ # Remove arguments that don't appear in the SQL query
+ for name in set(args) - names:
+Index: trac/util/text.py
+===================================================================
+--- trac/util/text.py (revision 12423)
++++ trac/util/text.py (working copy)
+@@ -598,6 +598,7 @@
+ text = text.replace(each, '')
+ return text
+
++
+ def unquote_label(txt):
+ """Remove (one level of) enclosing single or double quotes.
+
+@@ -705,3 +706,17 @@
+ prev[ridx] + cost)) # substitution
+ prev = curr
+ return prev[-1]
++
++
++sub_vars_re = re.compile("[$]([A-Z_][A-Z0-9_]*)")
++
++def sub_vars(text, args):
++ """Substitute $XYZ-style variables in a string with provided values.
++
++ :param text: string containing variables to substitute.
++ :param args: dictionary with keys matching the variables to be substituted.
++ The keys should not be prefixed with the $ character."""
++ def repl(match):
++ key = match.group(1)
++ return args[key] if key in args else '$' + key
++ return sub_vars_re.sub(repl, text)
</ins></span></pre>
</div>
</div>
</body>
</html>