Changeset 12053

Timestamp:

05/03/2018 07:56:54 PM (8 years ago)

Author:

imath

Message:

Nouveau: make sure all Ajax errors are handled in Messages UI

The Messages UI now informs the user when something went wrong while trying to fetch a single thread or when adding a new reply to a thread failed.

Fixes #7807

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• includes/messages/ajax.php (modified) (2 diffs)
• js/buddypress-messages.js (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

@@ -108 +108 @@
 function bp_nouveau_ajax_messages_send_reply() {
         $response = array(
-                'feedback' => __( 'There was a problem sending your reply. Please try again.', 'buddypress' ),
+                'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem sending your reply. Please try again.', 'buddypress' ) . '</p></div>',
                 'type'     => 'error',
         );
@@ -198 +198 @@
         global $messages_template;
 
-        if ( empty( $_POST['nonce'] ) ||  !wp_verify_nonce( $_POST['nonce'], 'bp_nouveau_messages' ) ) {
+        if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'bp_nouveau_messages' ) ) {
                 wp_send_json_error( array(
                         'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Unauthorized request.', 'buddypress' ) . '</p></div>',

trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js

@@ -1210 +1210 @@
                 },
 
-                messagesFetchError: function( collection ) {
-                        console.log( collection );
+                messagesFetchError: function( collection, response ) {
+                        if ( response.feedback && response.type ) {
+                                bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
+                        }
                 },
 
@@ -1253 +1255 @@
 
                 replyError: function( response ) {
-                        console.log( response );
+                        if ( response.feedback && response.type ) {
+                                bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
+                        }
                 }
         } );