Changeset 11674

Timestamp:

03/15/2022 08:03:17 AM (3 years ago)

Author:

dd32

Message:

Trac: Show the "please report this elsewhere" text on ticket pages after being opened.

Location:

sites/trunk

Files:

• trac.wordpress.org/templates/site.html (modified) (1 diff)
• wordpress.org/public_html/style/trac/wp-trac.js (modified) (5 diffs)

sites/trunk/trac.wordpress.org/templates/site.html

@@ -5 +5 @@
 
 <?python
-    scripts_version = '171'
+    scripts_version = '172'
     project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
     wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -86 +86 @@
             enable_copy: true
         },
-        'learn.wordpress.org': {
+        'Learn (learn.wordpress.org)': {
             tracker: 'https://github.com/WordPress/learn/issues/new',
             tracker_text: 'WordPress.org Learn GitHub Repository',
@@ -774 +774 @@
                     }
                 }
-                return;
             }
 
@@ -794 +793 @@
 
                 // If the component (ie. Editor) allows bypassing the warning show the create buttons.
-                if ( tracker.allow_bypass ) {
+                if ( ! wpTrac.isNewTicket() || tracker.allow_bypass ) {
                     toggle.show();
                 }
@@ -803 +802 @@
                         '<a href="' + tracker.tracker + '">' + ( tracker.tracker_text || tracker.tracker ) + '</a>' +
                     '</p><p>' +
-                        'Would you mind opening this ticket over there instead? ' +
+                        '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>' +
-                        ( tracker.allow_bypass ? '<p>If this isn\'t related to ' + ( tracker.bug_text || selectedComponent ) + ', please continue to open this ticket here.</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>'
                 );
             });
+
+            if ( ! wpTrac.isNewTicket() && ! $('#action_reopen').length ) {
+                component.trigger('change');
+            }
 
             $('#propertyform').on( 'click', '#new-tracker-ticket', function() {
@@ -824 +827 @@
                 url_params[description_field] = $('#field-description').val()
 
-                url = href + ( href.indexOf( '?' ) ? '&' : '?' ) + $.param( url_params );
+                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 + '?' + $.param( url_params );
+                    url = href + ( href.indexOf( '?' ) !== -1 ? '&' : '?' ) + $.param( url_params );
                     window.open( url );
                 } else {