<!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>[11674] sites/trunk: Trac: Show the "please report this elsewhere" text on ticket pages after being opened.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/11674">11674</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11674","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-03-15 08:03:17 +0000 (Tue, 15 Mar 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Trac: Show the "please report this elsewhere" text on ticket pages after being opened.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktracwordpressorgtemplatessitehtml">sites/trunk/trac.wordpress.org/templates/site.html</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptracjs">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktracwordpressorgtemplatessitehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/trac.wordpress.org/templates/site.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/site.html 2022-03-14 19:31:58 UTC (rev 11673)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2022-03-15 08:03:17 UTC (rev 11674)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> py:strip="">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?python
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- scripts_version = '171'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scripts_version = '172'
</ins><span class="cx" style="display: block; padding: 0 10px"> project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
</span><span class="cx" style="display: block; padding: 0 10px"> wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'
</span><span class="cx" style="display: block; padding: 0 10px"> is_bug_gardener = 'TICKET_EDIT_DESCRIPTION' in perm(resource)
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptracjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2022-03-14 19:31:58 UTC (rev 11673)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2022-03-15 08:03:17 UTC (rev 11674)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> tracker_text: 'Five for the Future GitHub Repository',
</span><span class="cx" style="display: block; padding: 0 10px"> enable_copy: true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'learn.wordpress.org': {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Learn (learn.wordpress.org)': {
</ins><span class="cx" style="display: block; padding: 0 10px"> tracker: 'https://github.com/WordPress/learn/issues/new',
</span><span class="cx" style="display: block; padding: 0 10px"> tracker_text: 'WordPress.org Learn GitHub Repository',
</span><span class="cx" style="display: block; padding: 0 10px"> enable_copy: true
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,7 +773,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> component.children('option[value="' + c + '"]').remove();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Show a notice when the component is selected.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +792,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var tracker = bugTrackerLocations[ selectedComponent ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the component (ie. Editor) allows bypassing the warning show the create buttons.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( tracker.allow_bypass ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wpTrac.isNewTicket() || tracker.allow_bypass ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> toggle.show();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,14 +801,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>Tickets related to ' + ( tracker.bug_text || selectedComponent ) + '</strong> should be filed on the ' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="' + tracker.tracker + '">' + ( tracker.tracker_text || tracker.tracker ) + '</a>' +
</span><span class="cx" style="display: block; padding: 0 10px"> '</p><p>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Would you mind opening this ticket over there instead? ' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Would you mind creating this ticket over there instead if appropriate? ' +
</ins><span class="cx" style="display: block; padding: 0 10px"> ( tracker.enable_copy ? '<a href="' + tracker.tracker + '" id="new-tracker-ticket">Click here to copy your summary and description over</a>.' : '' ) +
</span><span class="cx" style="display: block; padding: 0 10px"> '</p>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( tracker.allow_bypass ? '<p>If this isn\'t related to ' + ( tracker.bug_text || selectedComponent ) + ', please continue to open this ticket here.</p>' : '' ) +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( wpTrac.isNewTicket() && tracker.allow_bypass ? "<p>If this isn't related to " + ( tracker.bug_text || selectedComponent ) + ', please continue to open this ticket here.</p>' : '' ) +
</ins><span class="cx" style="display: block; padding: 0 10px"> '</div>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wpTrac.isNewTicket() && ! $('#action_reopen').length ) {
+ component.trigger('change');
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#propertyform').on( 'click', '#new-tracker-ticket', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var url, url_params = {}, href = $(this).attr( 'href' ),
</span><span class="cx" style="display: block; padding: 0 10px"> summary_field = 'summary', description_field = 'description';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,10 +826,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> url_params[summary_field] = $('#field-summary').val();
</span><span class="cx" style="display: block; padding: 0 10px"> url_params[description_field] = $('#field-description').val()
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url = href + ( href.indexOf( '?' ) ? '&' : '?' ) + $.param( url_params );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url = href + ( href.indexOf( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( url.length > 1500 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> url_params[description_field] = '(Couldn\'t copy over your description as it was too long. Please paste it here. Your old window was not closed.)';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url = href + '?' + $.param( url_params );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url = href + ( href.indexOf( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
</ins><span class="cx" style="display: block; padding: 0 10px"> window.open( url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> window.location.href = url;
</span></span></pre>
</div>
</div>
</body>
</html>