Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show doc counts in group and user tabs, fixes #423 #442

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

show doc counts in group and user tabs, fixes #423 #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cc3abc
re-enable counts on Docs tab, fixes #1
JonathanReeve Feb 25, 2015
81d5fb5
better updating of docs count for #1
JonathanReeve Feb 25, 2015
35d047a
cleaning up
JonathanReeve Feb 25, 2015
4ec4b2c
support for updating doc count on first run
JonathanReeve Feb 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions includes/component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ function set_current_view( $item_type = false ) {
function setup_nav( $main_nav = array(), $sub_nav = array() ) {

$main_nav = array(
'name' => bp_docs_get_user_tab_name(),
//'name' => bp_docs_get_user_tab_name(),

// Disabled count for now. See https://github.com/boonebgorges/buddypress-docs/issues/261
//'name' => sprintf( __( 'Docs <span>%d</span>', 'bp-docs' ), bp_docs_get_doc_count( bp_displayed_user_id(), 'user' ) ),
'name' => sprintf( __( 'Docs <span>%d</span>', 'bp-docs' ), bp_docs_get_doc_count( bp_displayed_user_id(), 'user' ) ),
'slug' => bp_docs_get_docs_slug(),
'position' => 80,
'screen_function' => array( &$this, 'template_loader' ),
Expand Down
47 changes: 34 additions & 13 deletions includes/integration-groups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ function __construct() {
add_filter( 'bp_docs_hide_sitewide', array( $this, 'hide_sitewide' ), 10, 5 );

// These functions are used to keep the group Doc count up to date
add_filter( 'bp_docs_doc_saved', array( $this, 'update_doc_count' ) );
add_filter( 'bp_docs_doc_deleted', array( $this, 'update_doc_count' ) );
add_action( 'bp_docs_doc_saved', array( $this, 'update_doc_count' ) );
add_action( 'bp_docs_doc_deleted', array( $this, 'update_doc_count' ) );

// On non-group Doc directories, add a Groups column
add_filter( 'bp_docs_loop_additional_th', array( $this, 'groups_th' ), 5 );
Expand All @@ -75,7 +75,7 @@ function __construct() {
// Sneak into the nav before it's rendered to insert the group Doc count. Hooking
// to bp_actions because of the craptastic nature of the BP_Group_Extension loader
// @todo Temporarily disabled
//add_action( 'bp_actions', array( $this, 'show_doc_count_in_tab' ), 9 );
add_action( 'bp_actions', array( $this, 'show_doc_count_in_tab' ), 9 );

// Prettify the page title
add_filter( 'bp_page_title', array( $this, 'page_title' ) );
Expand Down Expand Up @@ -682,15 +682,34 @@ function hide_sitewide( $hide_sitewide, $comment, $doc, $item, $component ) {
* @package BuddyPress Docs
* @since 1.0.8
*/
function update_doc_count() {
function update_doc_count( $group_id = 0 ) {
global $bp;

// If this is not a group Doc, skip it
if ( !bp_is_group() )
return;

// Get a fresh doc count for the group
bp_docs_update_doc_count( bp_get_current_group_id(), 'group' );
if ( array_key_exists( 'delete', $_GET ) ) {
// We're deleting a doc. In the deleting context,
// we get useful information from `bp_docs_get_associated_group_id()`.
$doc_id = is_singular() ? get_the_ID() : 0;
$group_id = bp_docs_get_associated_group_id( $doc_id );
} else if ( array_key_exists( 'group', $_GET ) ) {
// We're creating a doc. In the doc creation context,
// we don't get anything useful from `bp_docs_get_associated_group_id()`,
// so we have to figure out what group we're in by looking at the
// $_GET variable that's passed during this step.
$group_id = BP_Groups_Group::group_exists( $_GET['group'] );
} else if ( 0 !== $group_id ) {
// If $group_id is passed through this function,
// that means it's probably being called via show_doc_count_in_tab().
// This means that the doc count is probably '', which means this is probably
// the first time this function has been run for this group.
// Nothing to do here. Pass along through.
} else {
// If we're not creating or deleting a document, or updating for the first time,
// get outta here!
return;
}

// Update the doc count for the group, since it has now changed.
bp_docs_update_doc_count( $group_id, 'group' );
}

/**
Expand Down Expand Up @@ -837,12 +856,14 @@ function show_doc_count_in_tab() {
if ( !empty( $bp->bp_options_nav[$group_slug] ) && !empty( $bp->bp_options_nav[$group_slug][ $docs_slug ] ) ) {
$current_tab_name = $bp->bp_options_nav[$group_slug][ $docs_slug ]['name'];

$doc_count = groups_get_groupmeta( $bp->groups->current_group->id, 'bp-docs-count' );
$group_id = $bp->groups->current_group->id;

$doc_count = groups_get_groupmeta( $group_id, 'bp-docs-count' );

// For backward compatibility
if ( '' === $doc_count ) {
BP_Docs_Groups_Integration::update_doc_count();
$doc_count = groups_get_groupmeta( $bp->groups->current_group->id, 'bp-docs-count' );
BP_Docs_Groups_Integration::update_doc_count( $group_id );
$doc_count = groups_get_groupmeta( $group_id, 'bp-docs-count' );
}

$bp->bp_options_nav[$group_slug][ $docs_slug ]['name'] = sprintf( __( '%s <span>%d</span>', 'bp-docs' ), $current_tab_name, $doc_count );
Expand Down