<!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>[9700] sites/trunk: Trac: Redirect Gutenberg, WordCamp, Five for the future, and WordPress.org tickets to the proper bug trackers.</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/9700">9700</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/9700","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>2020-04-06 03:13:11 +0000 (Mon, 06 Apr 2020)</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: Redirect Gutenberg, WordCamp, Five for the future, and WordPress.org tickets to the proper bug trackers.
These apply based on the component, so if a Trac doesn't have the component it's obviously not going to do any redirection logic for it.
Bug Gardeners can always bypass, but regular users won't see the Create buttons (Except for Editor, which can by bypassed).
Fixes <a href="http://meta.trac.wordpress.org/ticket/4643">#4643</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 2020-04-06 01:35:37 UTC (rev 9699)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2020-04-06 03:13:11 UTC (rev 9700)
</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 = '140'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scripts_version = '141'
</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 2020-04-06 01:35:37 UTC (rev 9699)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2020-04-06 03:13:11 UTC (rev 9700)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* globals wpTracAutoCompleteUsers, wpTracContributorLabels, wpTracCurrentUser */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var wpTrac, coreKeywordList, gardenerKeywordList, reservedTerms, coreFocusesList, $body;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var wpTrac, coreKeywordList, gardenerKeywordList, reservedTerms, coreFocusesList, bugTrackerLocations, $body;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($){
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'coding-standards' : 'Coding Standards focus.'
</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">+ // Other Bug Trackers which the WordPress project uses for various things.
+ bugTrackerLocations = {
+ 'WordPress.org Site': {
+ tracker: 'https://meta.trac.wordpress.org/newticket',
+ tracker_text: 'WordPress.org Meta Trac',
+ prevent_changing_to: true
+ },
+ 'Editor': {
+ tracker: 'https://github.com/WordPress/gutenberg/issues/new/choose',
+ tracker_text: 'Gutenberg GitHub Repository',
+ bug_text: "the Gutenberg Editor",
+ disable_copy: true, // Gutenberg has a bug-report flow.
+ allow_bypass: true,
+ },
+ 'WordCamp Site & Plugins': {
+ tracker: 'https://github.com/WordPress/wordcamp.org/issues/new/choose',
+ tracker_text: 'WordCamp.org GitHub Repository',
+ disable_copy: true // WordCamp has a bug-report flow.
+ },
+ 'Five For The Future': {
+ tracker: 'https://github.com/WordPress/five-for-the-future/issues/new',
+ tracker_text: 'Five for the Future GitHub Repository'
+ }
+ };
+
</ins><span class="cx" style="display: block; padding: 0 10px"> gardenerKeywordList = [ 'commit', 'early', 'i18n-change', 'good-first-bug', 'fixed-major' ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpDocumentor tags, but also a few common @-terms.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,9 +301,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">- if ( $body.hasClass( 'core' ) ) {
- wpTrac.coreToMeta();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpTrac.redirectTicketsToProperTracker();
</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">@@ -689,36 +712,77 @@
</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">- coreToMeta: 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">- if ( window.location.pathname !== '/newticket' ) {
- if ( ! wpTrac.gardener && component.val() !== 'WordPress.org site' ) {
- component.children('option[value="WordPress.org site"]').remove();
</del><ins style="background-color: #dfd; 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'];
+ }
+
+ // Prevent changing to the component if need be.
+ if ( window.location.pathname !== '/newticket' ) {
+ 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><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ // Show a notice when the component is selected.
</ins><span class="cx" style="display: block; padding: 0 10px"> component.change( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var toggle = $('input[name="attachment"]').parent().add('.ticketdraft').add('.wp-notice').add('div.buttons');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $(this).val() !== 'WordPress.org site' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Reset.
+ $('.wp-notice.component').remove();
+ toggle.hide();
+
+ var selectedComponent = $(this).val();
+ if ( !( selectedComponent in bugTrackerLocations ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> toggle.show();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.wp-notice.component').remove();
</del><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- toggle.hide();
- $('div.buttons').after( '<div class="wp-notice component"><p><strong>The WordPress.org site now has its own Trac</strong> at ' +
- '<a href="//meta.trac.wordpress.org/">meta.trac.wordpress.org</a>.</p><p>Would you mind opening this ticket over there instead? ' +
- '<a href="//meta.trac.wordpress.org/newticket" id="new-meta-ticket">Click here to copy your summary and description over</a>.</p></div>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ var tracker = bugTrackerLocations[ selectedComponent ];
+
+ // If the component (ie. Editor) allows bypassing the warning.. or if it's a Bug Gardener, show the create buttons.
+ if ( tracker.allow_bypass || wpTrac.gardener ) {
+ 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 opening this ticket over there instead? ' +
+ ( tracker.disable_copy ? '' : '<a href="' + tracker.tracker + '" id="new-tracker-ticket">Click here to copy your summary and description over</a>.' ) +
+ '</p>' +
+ ( 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><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-meta-ticket', function() {
- var url, href = $(this).attr( 'href' );
- url = href + '?' + $.param({ summary: $('#field-summary').val(), description: $('#field-description').val() });
</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';
+
+ // Trac (default) and GitHub are supported.
+ if ( href.match( /github.com/ ) ) {
+ summary_field = 'title';
+ description_field = 'body';
+ }
+
+ url_params[summary_field] = $('#field-summary').val();
+ url_params[description_field] = $('#field-description').val()
+
+ url = href + '?' + $.param( url_params );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( url.length > 1500 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url = href + '?' + $.param({
- summary: $('#field-summary').val(),
- description: '(Couldn\'t copy over your description as it was too long. Please paste it here. Your old window was not closed.)'
- });
</del><ins style="background-color: #dfd; text-decoration:none; 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.)';
+ url = href + '?' + $.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>