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

Cctria 440/artist pagination #63

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Cctria 440/artist pagination #63

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e91b47
Added setting for artist pagination
andrasguseo Nov 8, 2021
944bf45
Added sorting options to artists page
andrasguseo Nov 8, 2021
1d472fe
Removed AJAX ordering when pagination is active
andrasguseo Nov 8, 2021
5061b6f
Added records per page option for artists page
andrasguseo Nov 8, 2021
6c1391e
Code cleanup
andrasguseo Nov 8, 2021
b73fb49
Make sure drag and drop ordering is only possible when ordered by ord…
andrasguseo Nov 8, 2021
8a7a12f
Update readme.txt
andrasguseo Nov 8, 2021
707a312
Use esc_url() where needed (Apply suggestions from code review)
andrasguseo Dec 3, 2021
fed5931
Use shorthand for if/else (Apply suggestions from code review)
andrasguseo Dec 3, 2021
c0e1fbd
Use endif; style conditional.
andrasguseo Dec 3, 2021
210fbbe
Make sure the value is an integer
andrasguseo Dec 3, 2021
7eef0eb
Updated readme
andrasguseo Dec 3, 2021
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
346 changes: 206 additions & 140 deletions admin/artists.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,181 +4,247 @@ function gigpress_artists() {

global $wpdb;

if(isset($_POST['gpaction']) && $_POST['gpaction'] == "add") {
require_once('handlers.php');
if ( isset( $_POST['gpaction'] ) && $_POST['gpaction'] == "add" ) {
require_once( 'handlers.php' );
$result = gigpress_add_artist();
}

if(isset($_POST['gpaction']) && $_POST['gpaction'] == "update") {
require_once('handlers.php');
if ( isset( $_POST['gpaction'] ) && $_POST['gpaction'] == "update" ) {
require_once( 'handlers.php' );
$result = gigpress_update_artist();
}

if(isset($_GET['gpaction']) && $_GET['gpaction'] == "delete") {
require_once('handlers.php');
if ( isset( $_GET['gpaction'] ) && $_GET['gpaction'] == "delete" ) {
require_once( 'handlers.php' );
gigpress_delete_artist();
}

if(isset($_GET['gpaction']) && $_GET['gpaction'] == "import-tours") {
require_once('handlers.php');
if ( isset( $_GET['gpaction'] ) && $_GET['gpaction'] == "import-tours" ) {
require_once( 'handlers.php' );
gigpress_map_tours_to_artists();
}

$url_args = (isset($_GET['gp-page'])) ? '&gp-page=' . sanitize_text_field($_GET['gp-page']) : '';
$url_args = ( isset( $_GET['gp-page'] ) ) ? '&gp-page=' . sanitize_text_field( $_GET['gp-page'] ) : '';

$gpo = get_option( 'gigpress_settings' );

?>

<div class="wrap gigpress gp-artists">

<h1><?php _e("Artists", "gigpress"); ?></h1>

<?php
if(isset($_GET['gpaction']) && $_GET['gpaction'] == "edit" || isset($result) && isset($result['editing']) ) {

$artist_id = (isset($_REQUEST['artist_id'])) ? $wpdb->prepare('%d', $_REQUEST['artist_id']) : '';
<h1><?php _e( "Artists", "gigpress" ); ?></h1>

$artist = $wpdb->get_row("SELECT artist_name, artist_url FROM ". GIGPRESS_ARTISTS ." WHERE artist_id = ". $artist_id);
if($artist) {

$submit = '<span class="submit"><input type="submit" name="Submit" class="button-primary" value="' . __("Update artist", "gigpress") . '" /></span> ' . __("or", "gigpress") . ' <a href="' . admin_url('admin.php?page=gigpress-artists' . $url_args) . '">' . __("cancel", "gigpress") . '</a>'; ?>
<?php
if (
isset( $_GET['gpaction'] )
&& $_GET['gpaction'] == "edit"
|| isset( $result )
&& isset( $result['editing'] )
) {

$artist_id = ( isset( $_REQUEST['artist_id'] ) ) ? $wpdb->prepare( '%d', $_REQUEST['artist_id'] ) : '';

$artist = $wpdb->get_row( "SELECT artist_name, artist_url FROM " . GIGPRESS_ARTISTS . " WHERE artist_id = " . $artist_id );
if ( $artist ) {

$submit = '<span class="submit">';
$submit .= '<input type="submit" name="Submit" class="button-primary" value="' . __( "Update artist", "gigpress" ) . '" />';
$submit .= '</span> ';
$submit .= __( "or", "gigpress" );
$submit .= ' <a href="' . admin_url( 'admin.php?page=gigpress-artists' . $url_args ) . '">';
$submit .= __( "cancel", "gigpress" );
$submit .= '</a>';
?>

<h3><?php _e("Edit this artist", "gigpress"); ?></h3>
<h3><?php _e( "Edit this artist", "gigpress" ); ?></h3>

<form method="post" action="<?php echo admin_url("admin.php?page=gigpress-artists" . $url_args); ?>">
<form method="post" action="<?php echo admin_url( "admin.php?page=gigpress-artists" . $url_args ); ?>">
<input type="hidden" name="gpaction" value="update" />
<input type="hidden" name="artist_id" value="<?php echo $artist_id; ?>" />

<?php
} else {
?>
<?php
} else {
?>

<div id="message" class="error fade"><p><?php _e("Sorry, but we had trouble loading that artist for editing.", "gigpress"); ?></p></div>
<div id="message" class="error fade">
<p><?php _e( "Sorry, but we had trouble loading that artist for editing.", "gigpress" ); ?></p>
</div>

<h3><?php _e("Add an artist", "gigpress"); ?></h3>
<h3><?php _e( "Add an artist", "gigpress" ); ?></h3>

<?php
}
<?php
}

} else {
} else {

$artist = array();
$submit = '<span class="submit"><input type="submit" name="Submit" class="button-primary" value="' . __("Add artist", "gigpress") . '" /></span>'; ?>
$artist = [];
$submit = '<span class="submit"><input type="submit" name="Submit" class="button-primary" value="' . __( "Add artist", "gigpress" ) . '" /></span>'; ?>

<h2><?php _e("Add an artist", "gigpress"); ?></h2>
<h2><?php _e( "Add an artist", "gigpress" ); ?></h2>

<form method="post" action="<?php echo admin_url('admin.php?page=gigpress-artists' . $url_args); ?>">
<input type="hidden" name="gpaction" value="add" />
<form method="post" action="<?php echo admin_url( 'admin.php?page=gigpress-artists' . $url_args ); ?>">
<input type="hidden" name="gpaction" value="add" />

<?php
}
wp_nonce_field('gigpress-action') ?>

<table class="form-table gp-table">
<tr>
<th scope="row"><label for="artist_name"><?php _e("Artist name", "gigpress"); ?>:</label></th>
<td>
<input name="artist_name" id="artist_name" type="text" size="48" value="<?php if(isset($artist->artist_name)) echo gigpress_db_out($artist->artist_name); ?>" />
</td>
</tr>
<tr>
<th scope="row"><label for="artist_url"><?php _e("Artist URL", "gigpress"); ?>:</label></th>
<td>
<input name="artist_url" id="artist_url" type="text" size="48" value="<?php if(isset($artist->artist_url)) echo gigpress_db_out($artist->artist_url); ?>" />
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<?php echo $submit; ?>
</td>
</tr>
</table>

</form>

<h2><?php _e("All artists", "gigpress"); ?></h2>

<div class="tablenav">
<div class="alignleft"><p><?php _e("Note that you cannot delete an artist while they have shows in the database.", "gigpress"); ?></p></div>
<?php
$artists = fetch_gigpress_artists();
/* Removed pagination to allow for single-page AJAX reordering. Complaints might bring it back?
if($artists) {
$pagination_args['page'] = 'gigpress-artists';
$pagination = gigpress_admin_pagination(count($artists), 20, $pagination_args);
if($pagination) {
$artists = array_slice($artists, $pagination['offset'], $pagination['records_per_page']);
echo $pagination['output'];
}
}
*/
?>
</div>

<table class="widefat">
<thead>
<tr>
<th scope="col" class="gp-tiny">&nbsp;</th>
<th scope="col" class="gp-tiny">ID</th>
<th scope="col"><?php _e("Artist name", "gigpress"); ?></th>
<th scope="col" class="gp-centre"><?php _e("Number of shows", "gigpress"); ?></th>
<th class="gp-centre" scope="col"><?php _e("Actions", "gigpress"); ?></th>
</tr>
</thead>
<tbody class="gigpress-artist-sort">
<?php

if($artists) {

$i = 0;
foreach($artists as $artist) {

if($n = $wpdb->get_var("SELECT count(*) FROM ". GIGPRESS_SHOWS ." WHERE show_artist_id = ". $artist->artist_id . " AND show_status != 'deleted'")) {
$count = '<a href="' . admin_url('admin.php?page=gigpress-shows&amp;artist_id=' . $artist->artist_id) . '">' . $n . '</a>';
} else {
$count = 0;
<?php
}
wp_nonce_field( 'gigpress-action' ) ?>

<table class="form-table gp-table">
<tr>
<th scope="row"><label for="artist_name"><?php _e( "Artist name", "gigpress" ); ?>:</label></th>
<td>
<input name="artist_name" id="artist_name" type="text" size="48" value="<?php if ( isset( $artist->artist_name ) ) {
echo gigpress_db_out( $artist->artist_name );
} ?>" />
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
</td>
</tr>
<tr>
<th scope="row"><label for="artist_url"><?php _e( "Artist URL", "gigpress" ); ?>:</label></th>
<td>
<input name="artist_url" id="artist_url" type="text" size="48" value="<?php if ( isset( $artist->artist_url ) ) {
echo gigpress_db_out( $artist->artist_url );
} ?>" />
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<?php echo $submit; ?>
</td>
</tr>
</table>

</form>

<h2><?php _e( "All artists", "gigpress" ); ?></h2>

<div class="tablenav">
<div class="alignleft">
<p><?php _e( "Note that you cannot delete an artist while they have shows in the database.", "gigpress" ); ?></p>
</div>
<?php
$artists = fetch_gigpress_artists( isset( $_GET['orderby'] ) ? $_GET['orderby'] : '' );
//Removed pagination to allow for single-page AJAX reordering. Complaints might bring it back?
if ( isset( $gpo['artist_pagination'] ) && $gpo['artist_pagination'] ) {
if ( isset( $gpo['artist_per_page'] ) && intval( $gpo['artist_per_page'] ) ) {
$records_per_page = $gpo['artist_per_page'];
} else {
$records_per_page = 20;
}
if ( $artists ) {
$pagination_args['page'] = 'gigpress-artists';
$pagination = gigpress_admin_pagination( count( $artists ), $records_per_page, $pagination_args );
if ( $pagination ) {
$artists = array_slice( $artists, $pagination['offset'], $pagination['records_per_page'] );
echo $pagination['output'];
}
}
}

$i++;
$style = ($i % 2) ? '' : ' class="alternate"';
// Print out our rows.
?>
<tr<?php echo $style; ?> id="artist_<?php echo $artist->artist_id; ?>">
<td class="gp-tiny"><img src="<?php echo esc_url( GIGPRESS_PLUGIN_URL . 'images/sort.png' ); ?>" alt="" class="gp-sort-handle" /></td>
<td class="gp-tiny"><?php echo $artist->artist_id; ?></td>
<td><?php if(!empty($artist->artist_url)) echo '<a href="'.esc_url($artist->artist_url).'">'; echo wptexturize($artist->artist_name); if(!empty($artist->artist_url)) echo '</a>';?></td>
<td class="gp-centre"><?php echo $count; ?></td>
<td class="gp-centre">
<a href="<?php echo admin_url('admin.php?page=gigpress-artists&amp;gpaction=edit&amp;artist_id='.$artist->artist_id . $url_args); ?>" class="edit"><?php _e("Edit", "gigpress"); ?></a>
<?php if(!$count) { ?> | <a href="<?php echo wp_nonce_url(admin_url('admin.php?page=gigpress-artists&amp;gpaction=delete&amp;artist_id='.$artist->artist_id . $url_args), 'gigpress-action'); ?>" class="delete"><?php _e("Delete", "gigpress"); ?></a><?php } ?>
</td>
</div>

<table class="widefat">
<thead>
<tr>
<th scope="col" class="gp-tiny">
<a href="<?php echo admin_url( 'admin.php?page=gigpress-artists&orderby=artist_order' ); ?>">Order</a>
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
</th>
<th scope="col" class="gp-tiny">
<a href="<?php echo admin_url( 'admin.php?page=gigpress-artists&orderby=artist_id' ); ?>">ID</a>
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
</th>
<th scope="col">
<a href="<?php echo admin_url( 'admin.php?page=gigpress-artists&orderby=artist_name' ); ?>"><?php _e( "Artist name", "gigpress" ); ?></a>
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
</th>
<th scope="col" class="gp-centre"><?php _e( "Number of shows", "gigpress" ); ?></th>
<th class="gp-centre" scope="col"><?php _e( "Actions", "gigpress" ); ?></th>
</tr>
<?php }
} else {

// We don't have any artists, so let's say so
?>
<tr><td colspan="5"><strong><?php _e("No artists in the database", "gigpress"); ?></strong></td></tr>
<?php } ?>
</tbody>
<tfoot>
<tr>
<th scope="col" class="gp-tiny">&nbsp;</th>
<th scope="col" class="gp-tiny">ID</th>
<th scope="col"><?php _e("Artist name", "gigpress"); ?></th>
<th scope="col" class="gp-centre"><?php _e("Number of shows", "gigpress"); ?></th>
<th class="gp-centre" scope="col"><?php _e("Actions", "gigpress"); ?></th>
</tr>
</tfoot>
</table>

<?php if(isset($pagination)) : ?>
<div class="tablenav">
<?php // echo $pagination['output']; ?>
</div>
<?php endif; ?>
</thead>
<tbody class="gigpress-artist-sort">
<?php

if ( $artists ) {

$i = 0;
foreach ( $artists as $artist ) {

if ( $n = $wpdb->get_var( "SELECT count(*) FROM " . GIGPRESS_SHOWS . " WHERE show_artist_id = " . $artist->artist_id . " AND show_status != 'deleted'" ) ) {
$count = '<a href="' . admin_url( 'admin.php?page=gigpress-shows&amp;artist_id=' . $artist->artist_id ) . '">' . $n . '</a>';
} else {
$count = 0;
}

$i ++;
$style = ( $i % 2 ) ? '' : ' class="alternate"';
// Print out our rows.
?>
<tr<?php echo $style; ?> id="artist_<?php echo $artist->artist_id; ?>">
<td class="gp-tiny">
<?php if (
isset( $pagination )
|| isset( $_GET['orderby'] )
&& (
'artist_id' == $_GET['orderby']
|| 'artist_name' == $_GET['orderby']
)
) :
echo $artist->artist_order;
else: ?>
<img src="<?php echo esc_url( GIGPRESS_PLUGIN_URL . 'images/sort.png' ); ?>" alt="" class="gp-sort-handle" />
<?php endif; ?>
</td>
<td class="gp-tiny"><?php echo $artist->artist_id; ?></td>
<td><?php if ( ! empty( $artist->artist_url ) ) {
echo '<a href="' . esc_url( $artist->artist_url ) . '">';
}
echo wptexturize( $artist->artist_name );
if ( ! empty( $artist->artist_url ) ) {
echo '</a>';
} ?></td>
<td class="gp-centre"><?php echo $count; ?></td>
<td class="gp-centre">
<a href="<?php echo admin_url( 'admin.php?page=gigpress-artists&amp;gpaction=edit&amp;artist_id=' . $artist->artist_id . $url_args ); ?>" class="edit">
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
<?php _e( "Edit", "gigpress" ); ?>
</a>
<?php if ( ! $count ) { ?> |
<a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=gigpress-artists&amp;gpaction=delete&amp;artist_id=' . $artist->artist_id . $url_args ), 'gigpress-action' ); ?>" class="delete">
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
<?php _e( "Delete", "gigpress" ); ?>
</a>
<?php } ?>
</td>
</tr>
<?php }
} else {

// We don't have any artists, so let's say so
?>
<tr>
<td colspan="5"><strong><?php _e( "No artists in the database", "gigpress" ); ?></strong></td>
</tr>
<?php } ?>
</tbody>
<tfoot>
<tr>
<th scope="col" class="gp-tiny">&nbsp;</th>
<th scope="col" class="gp-tiny">ID</th>
<th scope="col"><?php _e( "Artist name", "gigpress" ); ?></th>
<th scope="col" class="gp-centre"><?php _e( "Number of shows", "gigpress" ); ?></th>
<th class="gp-centre" scope="col"><?php _e( "Actions", "gigpress" ); ?></th>
</tr>
</tfoot>
</table>

<?php if ( isset( $pagination ) ) : ?>
<div class="tablenav">
<?php
if ( $gpo['artist_pagination'] ) {
echo $pagination['output'];
}
andrasguseo marked this conversation as resolved.
Show resolved Hide resolved
?>
</div>
<?php endif; ?>

<div id="artist-sort-update"></div>
<div id="artist-sort-update"></div>

</div>
<?php }
<?php }
Loading