Changeset 2372

Timestamp:

01/19/2010 09:26:59 PM (15 years ago)

Author:

apeatling

Message:

Better friendship request usability.

Location:

trunk

Files:

• bp-friends/bp-friends-templatetags.php (modified) (3 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-default/members/single/friends/requests.php (modified) (2 diffs)

trunk/bp-friends/bp-friends-templatetags.php

@@ -161 +161 @@
 }
 
-function bp_friend_accept_request_link() {
-    echo bp_get_friend_accept_request_link();
-}
-    // You only have the user ID but you need the friendship ID !!
-
-    function bp_get_friend_accept_request_link() {
+function bp_friend_friendship_id() {
+    echo bp_get_friend_friendship_id();
+}
+    function bp_get_friend_friendship_id() {
         global $members_template, $bp;
 
@@ -174 +172 @@
         }
 
-        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
-    }
-
-function bp_friend_reject_request_link() {
-    echo bp_get_friend_reject_request_link();
-}
-    function bp_get_friend_reject_request_link() {
+        return apply_filters( 'bp_get_friend_friendship_id', $friendship_id );
+    }
+
+function bp_friend_accept_request_link() {
+    echo bp_get_friend_accept_request_link();
+}
+    function bp_get_friend_accept_request_link() {
         global $members_template, $bp;
 
@@ -188 +186 @@
         }
 
+        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
+    }
+
+function bp_friend_reject_request_link() {
+    echo bp_get_friend_reject_request_link();
+}
+    function bp_get_friend_reject_request_link() {
+        global $members_template, $bp;
+
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        }
+
         return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );
     }

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -353 +353 @@
 add_action( 'wp_ajax_addremove_friend', 'bp_dtheme_ajax_addremove_friend' );
 
+function bp_dtheme_ajax_accept_friendship() {
+    check_admin_referer( 'friends_accept_friendship' );
+
+    if ( !friends_accept_friendship( $_POST['id'] ) )
+        echo "-1<div id='message' class='error'><p>" . __( 'There was a problem accepting that request. Please try again.', 'buddypress' ) . '</p></div>';
+
+    return true;
+}
+add_action( 'wp_ajax_accept_friendship', 'bp_dtheme_ajax_accept_friendship' );
+
+function bp_dtheme_ajax_reject_friendship() {
+    check_admin_referer( 'friends_reject_friendship' );
+
+    if ( !friends_reject_friendship( $_POST['id'] ) )
+        echo "-1<div id='message' class='error'><p>" . __( 'There was a problem rejecting that request. Please try again.', 'buddypress' ) . '</p></div>';
+
+    return true;
+}
+add_action( 'wp_ajax_reject_friendship', 'bp_dtheme_ajax_reject_friendship' );
+
 function bp_dtheme_ajax_joinleave_group() {
     global $bp;

trunk/bp-themes/bp-default/_inc/global.js

@@ -768 +768 @@
     });
 
-    /** Friendship Request Buttons **************************************/
+    /** Friendship Requests **************************************/
+
+    j("ul#friend-list a.accept, ul#friend-list a.reject").click( function() {
+        var button = j(this);
+        var li = j(this).parents('ul#friend-list li');
+        var action_div = j(this).parents('li div.action');
+
+        var id = li.attr('id').substr( 11, li.attr('id').length );
+        var link_href = button.attr('href');
+
+        var nonce = link_href.split('_wpnonce=');
+            nonce = nonce[1];
+
+        if ( j(this).hasClass('accept') ) {
+            var action = 'accept_friendship';
+            action_div.children('a.reject').css( 'visibility', 'hidden' );
+        } else {
+            var action = 'reject_friendship';
+            action_div.children('a.accept').css( 'visibility', 'hidden' );
+        }
+
+        button.addClass('loading');
+
+        j.post( ajaxurl, {
+            action: action,
+            'cookie': encodeURIComponent(document.cookie),
+            'id': id,
+            '_wpnonce': nonce
+        },
+        function(response) {
+            button.removeClass('loading');
+
+            if ( response[0] + response[1] == '-1' ) {
+                li.prepend( response.substr( 2, response.length ) );
+                li.children('div#message').hide().fadeIn(200);
+            } else {
+                button.fadeOut( 100, function() {
+                    if ( j(this).hasClass('accept') )
+                        j(this).html( 'Accepted' ).fadeIn(50);
+                    else
+                        j(this).html( 'Rejected' ).fadeIn(50);
+                });
+            }
+        });
+
+        return false;
+    });
 
     j("div.friendship-button a").live('click', function() {

trunk/bp-themes/bp-default/members/single/friends/requests.php

@@ -6 +6 @@
         <?php while ( bp_members() ) : bp_the_member(); ?>
 
-            <li>
+            <li id="friendship-<?php bp_friend_friendship_id() ?>">
                 <div class="item-avatar">
                     <a href="<?php bp_member_link() ?>"><?php bp_member_avatar() ?></a>
@@ -20 +20 @@
                 <div class="action">
                     <a class="button accept" href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> &nbsp;
-                    <a class="button reject confirm" href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
+                    <a class="button reject" href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
 
                     <?php do_action( 'bp_friend_requests_item_action' ) ?>