Changeset 2586

Timestamp:

02/04/2010 01:16:01 PM (16 years ago)

Author:

apeatling

Message:

Fixing filter select on profile page objects.

Location:

trunk/bp-themes/bp-default

Files:

• _inc/ajax.php (modified) (1 diff)
• _inc/global.js (modified) (2 diffs)
• members/single/blogs.php (modified) (1 diff)
• members/single/groups.php (modified) (1 diff)

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

@@ -51 +51 @@
         $qs[] = 'page=' . $_POST['page'];
 
-    if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] )
+    if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
         $qs[] = 'search_terms=' . $_POST['search_terms'];
 

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

@@ -520 +520 @@
         var scope = css_id[1];
         var filter = j(this).val();
-        var search_terms = j("#" + object + "_search").val();
+        var search_terms = false;
+
+        if ( j('div.dir-search input').length )
+            search_terms = j('div.dir-search input').val();
+
+        if ( 'friends' == object )
+            object = 'members';
 
         bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, j.cookie('bp-' + object + '-extras') );
@@ -1045 +1051 @@
 function bp_init_objects(objects) {
     j(objects).each( function(i) {
-        if ( null != j.cookie('bp-' + objects[i] + '-filter') && j('div.' + objects[i]).length )
+        if ( null != j.cookie('bp-' + objects[i] + '-filter') && j('li#' + objects[i] + '-order-select select').length )
             j('li#' + objects[i] + '-order-select select option[value=' + j.cookie('bp-' + objects[i] + '-filter') + ']').attr( 'selected', 'selected' );
 

trunk/bp-themes/bp-default/members/single/blogs.php

@@ -3 +3 @@
         <?php bp_get_options_nav() ?>
 
-        <li id="blogs-filter-select" class="last filter">
+        <li id="blogs-order-select" class="last filter">
             <?php _e( 'Order By:', 'buddypress' ) ?>
             <select id="blogs-all">

trunk/bp-themes/bp-default/members/single/groups.php

@@ -6 +6 @@
 
         <?php if ( 'invites' != bp_current_action() ) : ?>
-        <li id="members-order-select" class="last filter">
+        <li id="groups-order-select" class="last filter">
 
             <?php _e( 'Order By:', 'buddypress' ) ?>