Changeset 53088

Timestamp:

04/07/2022 03:48:16 AM (3 years ago)

Author:

peterwilsoncc

Message:

Taxonomy: Show error message for terms without a name.

Display an error message to users if they attempt to create a term without a name via the admin-ajax add-tag action. This improves the accessibility of the screen by avoiding the use of color alone to indicate an error.

Props conner_bw, birgire, afercia.
Fixes #47018.

Location:

trunk/src

Files:

• js/_enqueues/admin/tags.js (modified) (2 diffs)
• wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/src/js/_enqueues/admin/tags.js

@@ -102 +102 @@
         var form = $(this).parents('form');
 
-        if ( ! validateForm( form ) )
-            return false;
-
         if ( addingTerm ) {
             // If we're adding a term, noop the button to avoid duplicate requests.
@@ -128 +125 @@
             $('#ajax-response').empty();
             res = wpAjax.parseAjaxResponse( r, 'ajax-response' );
-            if ( ! res || res.errors )
+
+            if ( res.errors && res.responses[0].errors[0].code === 'empty_term_name' ) {
+                validateForm( form );
+            }
+
+            if ( ! res || res.errors ) {
                 return;
+            }
 
             parent = form.find( 'select#parent' ).val();

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1072 +1072 @@
 
     if ( ! $tag || is_wp_error( $tag ) ) {
-        $message = __( 'An error has occurred. Please reload the page and try again.' );
+        $message    = __( 'An error has occurred. Please reload the page and try again.' );
+        $error_code = 'error';
 
         if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
             $message = $tag->get_error_message();
+        }
+
+        if ( is_wp_error( $tag ) && $tag->get_error_code() ) {
+            $error_code = $tag->get_error_code();
         }
 
@@ -1081 +1086 @@
             array(
                 'what' => 'taxonomy',
-                'data' => new WP_Error( 'error', $message ),
+                'data' => new WP_Error( $error_code, $message ),
             )
         );