Changeset 4414

Timestamp:

11/15/2012 05:42:38 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Forums Admin:

• Revert usage of Suggest for choosing a forum parent via auto-complete.
• Revert parts of r4260 and r4261.
• See #1910, #2014.

Location:

trunk/includes/admin

Files:

• admin.php (modified) (3 diffs)
• metaboxes.php (modified) (3 diffs)
• settings.php (modified) (1 diff)

trunk/includes/admin/admin.php

@@ -129 +129 @@
                 /** Ajax **************************************************************/
 
-                add_action( 'wp_ajax_bbp_suggest_forum',        array( $this, 'suggest_forum' ) );
-                add_action( 'wp_ajax_nopriv_bbp_suggest_forum', array( $this, 'suggest_forum' ) );
                 add_action( 'wp_ajax_bbp_suggest_topic',        array( $this, 'suggest_topic' ) );
                 add_action( 'wp_ajax_nopriv_bbp_suggest_topic', array( $this, 'suggest_topic' ) );
@@ -538 +536 @@
                 <script type="text/javascript">
                         jQuery(document).ready(function() {
-
-                                var bbp_forum_id = jQuery( '#bbp_forum_id' );
-
-                                bbp_forum_id.suggest( ajaxurl + '?action=bbp_suggest_forum', {
-                                        onSelect: function() {
-                                                var value = this.value;
-                                                bbp_forum_id.val( value.substr( 0, value.indexOf( ' ' ) ) );
-                                        }
-                                } );
 
                                 var bbp_topic_id = jQuery( '#bbp_topic_id' );
@@ -1258 +1247 @@
 
         /** Ajax ******************************************************************/
-
-        /**
-         * Ajax action for facilitating the forum auto-suggest
-         *
-         * @since bbPress (r4261)
-         *
-         * @uses get_posts()
-         * @uses bbp_get_forum_post_type()
-         * @uses bbp_get_forum_id()
-         * @uses bbp_get_forum_title()
-         */
-        public function suggest_forum() {
-
-                // Try to get some forums
-                $forums = get_posts( array(
-                        's'           => like_escape( $_REQUEST['q'] ),
-                        'post_type'   => bbp_get_forum_post_type(),
-                        'post_status' => array(
-                                bbp_get_public_status_id(),
-                                bbp_get_hidden_status_id(),
-                                bbp_get_private_status_id()
-                        ) 
-                ) );
-
-                // If we found some forums, loop through and display them
-                if ( ! empty( $forums ) ) {
-                        foreach ( (array) $forums as $post ) {
-                                echo sprintf( __( '%s - %s', 'bbpress' ), bbp_get_forum_id( $post->ID ), bbp_get_forum_title( $post->ID ) ) . "\n";
-                        }
-                }
-                die();
-        }
 
         /**

trunk/includes/admin/metaboxes.php

@@ -299 +299 @@
                 <strong class="label"><?php _e( 'Parent:', 'bbpress' ); ?></strong>
                 <label class="screen-reader-text" for="parent_id"><?php _e( 'Forum Parent', 'bbpress' ); ?></label>
-                <input name="parent_id" id="bbp_forum_id" type="text" value="<?php echo esc_attr( $post_parent ); ?>" />
+                <?php bbp_dropdown( array(
+                        'post_type'          => bbp_get_forum_post_type(),
+                        'selected'           => $post_parent,
+                        'sort_column'        => 'post_title',
+                        'child_of'           => '0',
+                        'numberposts'        => -1,
+                        'order'              => 'DESC',
+                        'walker'             => '',
+                        'exclude'            => $post_id,
+
+                        // Output-related
+                        'select_id'          => 'parent_id',
+                        'tab'                => bbp_get_tab_index(),
+                        'options_only'       => false,
+                        'show_none'          => __( '&mdash; No parent &mdash;', 'bbpress' ),
+                        'none_found'         => false,
+                        'disable_categories' => true,
+                        'disabled'           => ''
+                ) ); ?>
         </p>
 
@@ -339 +357 @@
                 <strong class="label"><?php _e( 'Forum:', 'bbpress' ); ?></strong>
                 <label class="screen-reader-text" for="parent_id"><?php _e( 'Forum', 'bbpress' ); ?></label>
-                <input name="parent_id" id="bbp_forum_id" type="text" value="<?php bbp_topic_forum_id( $post_id ); ?>" />
+                <?php bbp_dropdown( array(
+                        'post_type'          => bbp_get_forum_post_type(),
+                        'selected'           => bbp_get_topic_forum_id( $post_id ),
+                        'sort_column'        => 'post_title',
+                        'child_of'           => '0',
+                        'numberposts'        => -1,
+                        'order'              => 'DESC',
+                        'walker'             => '',
+                        'exclude'            => '',
+
+                        // Output-related
+                        'select_id'          => 'parent_id',
+                        'tab'                => bbp_get_tab_index(),
+                        'options_only'       => false,
+                        'show_none'          => __( '&mdash; No parent &mdash;', 'bbpress' ),
+                        'none_found'         => false,
+                        'disable_categories' => true,
+                        'disabled'           => ''
+                ) ); ?>
         </p>
 
@@ -374 +410 @@
                         <strong class="label"><?php _e( 'Forum:', 'bbpress' ); ?></strong>
                         <label class="screen-reader-text" for="bbp_forum_id"><?php _e( 'Forum', 'bbpress' ); ?></label>
-                        <input name="bbp_forum_id" id="bbp_forum_id" type="text" value="<?php echo esc_attr( $reply_forum_id ); ?>" />
+                        <?php bbp_dropdown( array(
+                                'post_type'          => bbp_get_forum_post_type(),
+                                'selected'           => $reply_forum_id,
+                                'sort_column'        => 'post_title',
+                                'child_of'           => '0',
+                                'numberposts'        => -1,
+                                'order'              => 'DESC',
+                                'walker'             => '',
+                                'exclude'            => '',
+
+                                // Output-related
+                                'select_id'          => 'bbp_forum_id',
+                                'tab'                => bbp_get_tab_index(),
+                                'options_only'       => false,
+                                'show_none'          => __( '&mdash; No parent &mdash;', 'bbpress' ),
+                                'none_found'         => false,
+                                'disable_categories' => true,
+                                'disabled'           => ''
+                        ) ); ?>
                 </p>
 

trunk/includes/admin/settings.php

@@ -923 +923 @@
  */
 function bbp_admin_setting_callback_group_forums_root_id() {
-?>
-
-        <?php
-                bbp_dropdown( array(
-                        'selected'           => bbp_get_group_forums_root_id(),
-                        'show_none'          => __( '(Forum Root)', 'bbpress' ),
-                        'select_id'          => '_bbp_group_forums_root_id',
-                        'disable_categories' => false,
-                        'disabled'           => '_bbp_group_forums_root_id'
-                ) );
-        ?>
+
+        // Output the dropdown for all forums
+        bbp_dropdown( array(
+                'selected'           => bbp_get_group_forums_root_id(),
+                'show_none'          => __( '&mdash; Forum root &mdash;', 'bbpress' ),
+                'sort_column'        => 'post_title',
+                'select_id'          => '_bbp_group_forums_root_id',
+                'disable_categories' => false,
+                'disabled'           => '_bbp_group_forums_root_id'
+        ) ); ?>
 
         <label for="_bbp_group_forums_root_id"><?php _e( 'is the parent for all group forums', 'bbpress' ); ?></label>