<!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>[11705] sites/trunk: Trac: Change how the "Don't report this here" Trac Redirect works, to avoid triggering a ticket-change, causing the page to reload sans JS enhancements.</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/11705">11705</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/11705","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-28 07:25:34 +0000 (Mon, 28 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: Change how the "Don't report this here" Trac Redirect works, to avoid triggering a ticket-change, causing the page to reload sans JS enhancements.
Fixes <a href="http://meta.trac.wordpress.org/ticket/6220">#6220</a>.</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-28 04:28:51 UTC (rev 11704)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2022-03-28 07:25:34 UTC (rev 11705)
</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 = '173'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scripts_version = '174'
</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-28 04:28:51 UTC (rev 11704)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2022-03-28 07:25:34 UTC (rev 11705)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ticket-only tweaks.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( content.hasClass( 'ticket' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpTrac.redirectTicketsToProperTracker();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpTrac.redirectTicketsToProperTracker.init();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A collection of ticket hacks that must be run again after previews.
</span><span class="cx" style="display: block; padding: 0 10px"> wpTrac.postPreviewHacks();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,87 +766,95 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- redirectTicketsToProperTracker: function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ redirectTicketsToProperTracker: ( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var component = $('#field-component');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Special hack to not show the warning on Meta Trac for the WordPress.org site.
- if ( window.location.host === 'meta.trac.wordpress.org' ) {
- delete bugTrackerLocations['WordPress.org Site'];
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prevent changing to the component if need be.
- if ( ! wpTrac.isNewTicket() ) {
- for ( var c in bugTrackerLocations ) {
- if ( ! bugTrackerLocations[c].prevent_changing_to ) {
- continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return {
+ init: function() {
+ // Special hack to not show the warning on Meta Trac for the WordPress.org site.
+ if ( window.location.host === 'meta.trac.wordpress.org' ) {
+ delete bugTrackerLocations['WordPress.org Site'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( component.val() != c ) {
- component.children('option[value="' + c + '"]').remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Prevent changing to the component if need be.
+ if ( ! wpTrac.isNewTicket() ) {
+ for ( var c in bugTrackerLocations ) {
+ if ( ! bugTrackerLocations[c].prevent_changing_to ) {
+ continue;
+ }
+ if ( component.val() != c ) {
+ component.children('option[value="' + c + '"]').remove();
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Show a notice when the component is selected.
- component.change( function() {
- var toggle = $('input[name="attachment"]').parent().add('.ticketdraft').add('.wp-notice').add('div.buttons');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Show a notice when the component is selected.
+ component.change( wpTrac.redirectTicketsToProperTracker.maybeShowNotice );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reset.
- $('.wp-notice.component').remove();
- toggle.hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trigger a warning on load, when the ticket is not closed.
+ if ( ! wpTrac.isNewTicket() && ! $('#action_reopen').length ) {
+ wpTrac.redirectTicketsToProperTracker.maybeShowNotice();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var selectedComponent = $(this).val();
- if ( !( selectedComponent in bugTrackerLocations ) ) {
- toggle.show();
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#propertyform').on( 'click', '#new-tracker-ticket', function() {
+ var url, url_params = {}, href = $(this).attr( 'href' ),
+ summary_field = 'summary', description_field = 'description';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var tracker = bugTrackerLocations[ selectedComponent ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trac (default) and GitHub are supported.
+ if ( href.match( /github.com/ ) ) {
+ summary_field = 'title';
+ description_field = 'body';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the component (ie. Editor) allows bypassing the warning show the create buttons.
- if ( ! wpTrac.isNewTicket() || tracker.allow_bypass ) {
- toggle.show();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url_params[summary_field] = $('#field-summary').val();
+ url_params[description_field] = $('#field-description').val()
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('div.buttons').before(
- '<div class="wp-notice component"><p>' +
- '<strong>Tickets related to ' + ( tracker.bug_text || selectedComponent ) + '</strong> should be filed on the ' +
- '<a href="' + tracker.tracker + '">' + ( tracker.tracker_text || tracker.tracker ) + '</a>' +
- '</p><p>' +
- 'Would you mind creating this ticket over there instead if appropriate? ' +
- ( tracker.enable_copy ? '<a href="' + tracker.tracker + '" id="new-tracker-ticket">Click here to copy your summary and description over</a>.' : '' ) +
- '</p>' +
- ( wpTrac.isNewTicket() && tracker.allow_bypass ? "<p>If this isn't related to " + ( tracker.bug_text || selectedComponent ) + ', please continue to open this ticket here.</p>' : '' ) +
- '</div>'
- );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url = href + ( href.indexOf( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
+ if ( url.length > 1500 ) {
+ 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.)';
+ url = href + ( href.indexOf( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
+ window.open( url );
+ } else {
+ window.location.href = url;
+ }
+ return false;
+ });
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wpTrac.isNewTicket() && ! $('#action_reopen').length ) {
- component.trigger('change');
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ maybeShowNotice: function() {
+ var toggle = $('input[name="attachment"]').parent().add('.ticketdraft').add('.wp-notice').add('div.buttons');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#propertyform').on( 'click', '#new-tracker-ticket', function() {
- var url, url_params = {}, href = $(this).attr( 'href' ),
- summary_field = 'summary', description_field = 'description';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset.
+ $('.wp-notice.component').remove();
+ toggle.hide();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Trac (default) and GitHub are supported.
- if ( href.match( /github.com/ ) ) {
- summary_field = 'title';
- description_field = 'body';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var selectedComponent = component.val();
+ if ( !( selectedComponent in bugTrackerLocations ) ) {
+ toggle.show();
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url_params[summary_field] = $('#field-summary').val();
- url_params[description_field] = $('#field-description').val()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var tracker = bugTrackerLocations[ selectedComponent ];
</ins><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( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
- if ( url.length > 1500 ) {
- 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.)';
- url = href + ( href.indexOf( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
- window.open( url );
- } else {
- window.location.href = url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the component (ie. Editor) allows bypassing the warning show the create buttons.
+ if ( ! wpTrac.isNewTicket() || tracker.allow_bypass ) {
+ toggle.show();
+ }
+
+ $('div.buttons').before(
+ '<div class="wp-notice component"><p>' +
+ '<strong>Tickets related to ' + ( tracker.bug_text || selectedComponent ) + '</strong> should be filed on the ' +
+ '<a href="' + tracker.tracker + '">' + ( tracker.tracker_text || tracker.tracker ) + '</a>' +
+ '</p><p>' +
+ 'Would you mind creating this ticket over there instead if appropriate? ' +
+ ( tracker.enable_copy ? '<a href="' + tracker.tracker + '" id="new-tracker-ticket">Click here to copy your summary and description over</a>.' : '' ) +
+ '</p>' +
+ ( wpTrac.isNewTicket() && tracker.allow_bypass ? "<p>If this isn't related to " + ( tracker.bug_text || selectedComponent ) + ', please continue to open this ticket here.</p>' : '' ) +
+ '</div>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
- });
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
+ }() ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> autocomplete: (function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var ticketParticipants = [],
</span></span></pre>
</div>
</div>
</body>
</html>