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

Jump to bottom

Output column data for a Posts 2 Posts/Users connection #106

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Output column data for a Posts 2 Posts/Users connection #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion extended-cpts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @link https://github.com/johnbillion/extended-cpts
* @copyright 2012-2017 John Blackbourn
* @license GPL v2 or later
* @version 4.2.0
* @version 4.2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
256 changes: 147 additions & 109 deletions src/class-extended-cpt-admin.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ public function admin_head() {

?>
<?php if ( isset( $this->args['admin_filters']['m'] ) && ! $this->args['admin_filters']['m'] ) { ?>
<style type="text/css">
#posts-filter select[name="m"] {
display: none;
}
</style>
<?php } ?>
<?php
<style type="text/css">
#posts-filter select[name="m"] {
display: none;
}
</style>
<?php } ?>
<?php

}
}

/**
* Set the default sort field and sort order on our post type admin screen.
Expand Down Expand Up @@ -258,7 +258,7 @@ public function filters() {
AND m.meta_value != ''
AND p.post_type = %s
ORDER BY m.meta_value ASC
", $filter['meta_key'], $this->cpt->post_type ) );
", $filter['meta_key'], $this->cpt->post_type ) );
// @codingStandardsIgnoreEnd
} elseif ( is_callable( $filter['options'] ) ) {
$filter['options'] = call_user_func( $filter['options'] );
Expand Down Expand Up @@ -286,64 +286,64 @@ public function filters() {
<?php
foreach ( $filter['options'] as $k => $v ) {
$key = ( $use_key ? $k : $v );
?>
?>
<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $selected, $key ); ?>><?php echo esc_html( $v ); ?></option>
<?php } ?>
</select>
<?php
<?php } ?>
</select>
<?php

} elseif ( isset( $filter['meta_search_key'] ) ) {
} elseif ( isset( $filter['meta_search_key'] ) ) {

# If we haven't specified a title, generate one from the meta key:
if ( ! isset( $filter['title'] ) ) {
$filter['title'] = str_replace( [
'-',
'_',
], ' ', $filter['meta_search_key'] );
$filter['title'] = ucwords( $filter['title'] );
}
if ( ! isset( $filter['title'] ) ) {
$filter['title'] = str_replace( [
'-',
'_',
], ' ', $filter['meta_search_key'] );
$filter['title'] = ucwords( $filter['title'] );
}

$value = wp_unslash( get_query_var( $filter_key ) );
$value = wp_unslash( get_query_var( $filter_key ) );

# Output the search box:
?>
<label><?php printf( '%s:', esc_html( $filter['title'] ) ); ?>&nbsp;<input type="text" name="<?php echo esc_attr( $filter_key ); ?>" id="filter_<?php echo esc_attr( $filter_key ); ?>" value="<?php echo esc_attr( $value ); ?>" /></label>
<?php
?>
<label><?php printf( '%s:', esc_html( $filter['title'] ) ); ?>&nbsp;<input type="text" name="<?php echo esc_attr( $filter_key ); ?>" id="filter_<?php echo esc_attr( $filter_key ); ?>" value="<?php echo esc_attr( $value ); ?>" /></label>
<?php

} elseif ( isset( $filter['meta_exists'] ) ) {
} elseif ( isset( $filter['meta_exists'] ) ) {

# If we haven't specified a title, use the all_items label from the post type:
if ( ! isset( $filter['title'] ) ) {
$filter['title'] = $pto->labels->all_items;
}
if ( ! isset( $filter['title'] ) ) {
$filter['title'] = $pto->labels->all_items;
}

$selected = wp_unslash( get_query_var( $filter_key ) );
$selected = wp_unslash( get_query_var( $filter_key ) );

if ( 1 === count( $filter['meta_exists'] ) ) {
if ( 1 === count( $filter['meta_exists'] ) ) {

# Output a checkbox:
foreach ( $filter['meta_exists'] as $v => $t ) {
?>
<label><input type="checkbox" name="<?php echo esc_attr( $filter_key ); ?>" id="filter_<?php echo esc_attr( $filter_key ); ?>" value="<?php echo esc_attr( $v ); ?>" <?php checked( $selected, $v ); ?>>&nbsp;<?php echo esc_html( $t ); ?></label>
<?php
}
} else {
foreach ( $filter['meta_exists'] as $v => $t ) {
?>
<label><input type="checkbox" name="<?php echo esc_attr( $filter_key ); ?>" id="filter_<?php echo esc_attr( $filter_key ); ?>" value="<?php echo esc_attr( $v ); ?>" <?php checked( $selected, $v ); ?>>&nbsp;<?php echo esc_html( $t ); ?></label>
<?php
}
} else {

# Output a dropdown:
?>
<select name="<?php echo esc_attr( $filter_key ); ?>" id="filter_<?php echo esc_attr( $filter_key ); ?>">
<option value=""><?php echo esc_html( $filter['title'] ); ?></option>
<?php foreach ( $filter['meta_exists'] as $v => $t ) { ?>
?>
<select name="<?php echo esc_attr( $filter_key ); ?>" id="filter_<?php echo esc_attr( $filter_key ); ?>">
<option value=""><?php echo esc_html( $filter['title'] ); ?></option>
<?php foreach ( $filter['meta_exists'] as $v => $t ) { ?>
<option value="<?php echo esc_attr( $v ); ?>" <?php selected( $selected, $v ); ?>><?php echo esc_html( $t ); ?></option>
<?php } ?>
</select>
<?php
<?php } ?>
</select>
<?php

}
}
}
}

}
}

/**
* Add our filter names to the public query vars.
Expand Down Expand Up @@ -818,41 +818,41 @@ public function col_taxonomy( string $taxonomy, array $args ) {

switch ( $args['link'] ) {
case 'view':
if ( $tax->public ) {
if ( $tax->public ) {
// https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1096
// @codingStandardsIgnoreStart
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url( get_term_link( $term ) ),
esc_html( $term->name )
);
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url( get_term_link( $term ) ),
esc_html( $term->name )
);
// @codingStandardsIgnoreEnd
} else {
$out[] = esc_html( $term->name );
}
break;
} else {
$out[] = esc_html( $term->name );
}
break;
case 'edit':
if ( current_user_can( $tax->cap->edit_terms ) ) {
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url( get_edit_term_link( $term, $taxonomy, $post->post_type ) ),
esc_html( $term->name )
);
} else {
$out[] = esc_html( $term->name );
}
break;
case 'list':
$link = add_query_arg( [
'post_type' => $post->post_type,
$taxonomy => $term->slug,
], admin_url( 'edit.php' ) );
if ( current_user_can( $tax->cap->edit_terms ) ) {
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url( $link ),
esc_url( get_edit_term_link( $term, $taxonomy, $post->post_type ) ),
esc_html( $term->name )
);
break;
} else {
$out[] = esc_html( $term->name );
}
break;
case 'list':
$link = add_query_arg( [
'post_type' => $post->post_type,
$taxonomy => $term->slug,
], admin_url( 'edit.php' ) );
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url( $link ),
esc_html( $term->name )
);
break;
}
} else {

Expand Down Expand Up @@ -881,36 +881,36 @@ public function col_post_field( string $field, array $args ) {
case 'post_date_gmt':
case 'post_modified':
case 'post_modified_gmt':
if ( '0000-00-00 00:00:00' !== get_post_field( $field, $post ) ) {
if ( ! isset( $args['date_format'] ) ) {
$args['date_format'] = get_option( 'date_format' );
}
echo esc_html( mysql2date( $args['date_format'], get_post_field( $field, $post ) ) );
if ( '0000-00-00 00:00:00' !== get_post_field( $field, $post ) ) {
if ( ! isset( $args['date_format'] ) ) {
$args['date_format'] = get_option( 'date_format' );
}
break;
echo esc_html( mysql2date( $args['date_format'], get_post_field( $field, $post ) ) );
}
break;

case 'post_status':
$status = get_post_status_object( get_post_status( $post ) );
if ( $status ) {
echo esc_html( $status->label );
}
break;
$status = get_post_status_object( get_post_status( $post ) );
if ( $status ) {
echo esc_html( $status->label );
}
break;

case 'post_author':
echo esc_html( get_the_author() );
break;
echo esc_html( get_the_author() );
break;

case 'post_title':
echo esc_html( get_the_title() );
break;
echo esc_html( get_the_title() );
break;

case 'post_excerpt':
echo esc_html( get_the_excerpt() );
break;
echo esc_html( get_the_excerpt() );
break;

default:
echo esc_html( get_post_field( $field, $post ) );
break;
echo esc_html( get_post_field( $field, $post ) );
break;

}

Expand Down Expand Up @@ -956,7 +956,7 @@ public function col_featured_image( string $image_size, array $args ) {
}

/**
* Output column data for a Posts 2 Posts connection.
* Output column data for a Posts 2 Posts/Users connection.
*
* @param string $connection The ID of the connection type
* @param array $args Array of arguments for a given connection type
Expand Down Expand Up @@ -1009,21 +1009,58 @@ public function col_connection( string $connection, array $args ) {
foreach ( $_post->$field as $post ) {

setup_postdata( $post );
//echo "<pre>";var_dump( $post,__LINE__);echo "</pre>";
if ( get_class($post) == 'WP_User' ){
if ( $args['link'] ) {
switch ( $args['link'] ) {
case 'view':
$out[] = esc_html( $post->user_nicename );
break;
case 'edit':
if ( current_user_can( 'edit_users', $post->ID ) ) {
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url(get_edit_user_link( $post->ID ) ),
esc_html( $post->user_nicename )
);
} else {
$out[] = esc_html( $post->user_nicename );
}
break;
case 'list':
$link = add_query_arg( array_merge( [
'post_type' => $_post->post_type,
'connected_type' => $connection,
'connected_items' => $post->ID,
], $meta ), admin_url( 'edit.php' ) );
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
esc_url( $link ),
esc_html( $post->user_nicename )
);
break;
}
} else {

$pto = get_post_type_object( $post->post_type );
$pso = get_post_status_object( $post->post_status );
$out[] = esc_html( get_the_title() );

if ( $pso->protected && ! current_user_can( 'edit_post', $post->ID ) ) {
continue;
}
if ( 'trash' === $post->post_status ) {
continue;
}
}

if ( $args['link'] ) {
}else{
$pto = get_post_type_object( $post->post_type );
$pso = get_post_status_object( $post->post_status );

switch ( $args['link'] ) {
case 'view':
if ( $pso->protected && ! current_user_can( 'edit_post', $post->ID ) ) {
continue;
}
if ( 'trash' === $post->post_status ) {
continue;
}

if ( $args['link'] ) {

switch ( $args['link'] ) {
case 'view':
if ( $pto->public ) {
if ( $pso->protected ) {
$out[] = sprintf(
Expand All @@ -1042,7 +1079,7 @@ public function col_connection( string $connection, array $args ) {
$out[] = esc_html( get_the_title() );
}
break;
case 'edit':
case 'edit':
if ( current_user_can( 'edit_post', $post->ID ) ) {
$out[] = sprintf(
'<a href="%1$s">%2$s</a>',
Expand All @@ -1053,7 +1090,7 @@ public function col_connection( string $connection, array $args ) {
$out[] = esc_html( get_the_title() );
}
break;
case 'list':
case 'list':
$link = add_query_arg( array_merge( [
'post_type' => $_post->post_type,
'connected_type' => $connection,
Expand All @@ -1065,11 +1102,12 @@ public function col_connection( string $connection, array $args ) {
esc_html( get_the_title() )
);
break;
}
} else {
}
} else {

$out[] = esc_html( get_the_title() );
$out[] = esc_html( get_the_title() );

}
}
}

Expand Down