';
+ }
+
+ if ( $echo )
+ echo $group_out;
+ else
+ return $group_out;
+}
+
+/**
+* DEPECRATED FUNCTIONS
+* This section contains functions no longer active but still required for upgrade purposes.
+**/
+function get_old_series_groups( $args = array() ) {
+ global $wpdb;
+
+ $defaults = array (
+ 'orderby' => 'term_id',
+ 'order' => 'ASC',
+ 'exclude' => array(),
+ 'include' => array(),
+ 'number' => '',
+ 'fields' => 'all',
+ 'number' => '',
+ 'offset' => '',
+ 'exclusions' => '',
+ 'limit' => '',
+ 'hide_empty' => true,
+ 'taxonomy' => 'series_group'
+ );
+
+ $args = wp_parse_args( $args, $defaults );
+ $args['number'] = absint( $args['number'] );
+ $args['offset'] = absint( $args['offset'] );
+
+ extract($args, EXTR_SKIP);
+
+ $_orderby = strtolower($orderby);
+ if ( empty($_orderby) || 'id' == $_orderby )
+ $orderby = 'seriest.term_id';
+ elseif ( 'name' == $_orderby )
+ $orderby = 'seriest.name';
+ elseif ( 'slug' == $_orderby )
+ $orderby = 'seriest.slug';
+ elseif ( 'term_id' == $_orderby )
+ $orderby = 'seriest.term_id';
+
+ if ( !empty($orderby) )
+ $orderby = "ORDER BY $orderby";
+ else
+ $order = '';
+
+ $where = '';
+ $inclusions = '';
+
+ if ( !empty($include) ) {
+ $exclude = '';
+ $ingroups = wp_parse_id_list($include);
+
+ foreach ( $ingroups as $ingroup ) {
+ if ( empty($inclusions) )
+ $inclusions = ' AND ( seriest.term_id = ' . intval($ingroup) . ' ';
+ else
+ $inclusions .= ' OR seriest.term_id = ' . intval($ingroup) . ' ';
+ }
+ }
+
+ if ( !empty($inclusions) )
+ $inclusions .= ')';
+ $where .= $inclusions;
+
+ if ( !empty($exclude) ) {
+ $exgroups = wp_parse_id_list($exclude);
+ foreach ( $exgroups as $exgroup ) {
+ if ( empty($exclusions) )
+ $exclusions = ' AND ( seriest.term_id <> ' . intval($exgroup) . ' ';
+ else
+ $exclusions .= ' AND seriest.term_id <> ' . intval($exgroup) . ' ';
+ }
+ }
+
+ $where .= $exclusions;
+
+ if ( ! empty($number ) ) {
+ if ( $offset )
+ $limit = 'LIMIT ' . $offset . ',' . $number;
+ else
+ $limit = 'LIMIT ' . $number;
+ }
+
+ if ( $hide_empty ) {
+ $where .= ' AND seriesttt.count != 0';
+ }
+
+ $selects = array();
+ switch ( $fields ) {
+ case 'all':
+ $selects = array('seriest.term_id', 'seriest.name', 'seriest.slug');
+ break;
+ case 'ids':
+ $selects = array('seriest.term_id');
+ break;
+ case 'names':
+ $selects = array('seriest.term_id', 'seriest.name');
+ break;
+ case 'slugs':
+ $selects = array('seriest.term_id', 'seriest.slug');
+ break;
+ case 'count':
+ $orderby = '';
+ $order = '';
+ $selects = array('COUNT(*)');
+ }
+
+ $select_this = implode(', ', $selects);
+
+ $query = $wpdb->prepare( "SELECT DISTINCT $select_this FROM $wpdb->term_relationships seriestt INNER JOIN $wpdb->posts seriesp ON seriestt.object_id = seriesp.ID INNER JOIN $wpdb->term_taxonomy seriesttt ON seriesttt.term_taxonomy_id = seriestt.term_taxonomy_id INNER JOIN $wpdb->terms seriest ON seriesttt.term_id = seriest.term_id WHERE seriesp.post_type = 'series_grouping' AND seriesttt.taxonomy = '%s' $where $orderby $order $limit", $taxonomy );
+
+ if ( 'count' == $fields ) {
+ $group_count = $wpdb->get_var($query);
+ return $group_count;
+ }
+
+ $series_groups = $wpdb->get_results($query);
+
+ $_groups = array();
+
+ if ( 'ids' == $fields ) {
+ while ( $group = array_shift($series_groups) )
+ $_groups[] = $group->term_id;
+ $series_groups = $_groups;
+ } elseif ( 'names' == $fields ) {
+ while ( $group = array_shift($series_groups) )
+ $_groups[] = $group->name;
+ $series_groups = $_groups;
+ } elseif ( 'slugs' == $fields ) {
+ while ( $group = array_shift($series_groups) )
+ $_groups[] = $group->slug;
+ $series_groups = $_groups;
+ }
+
+ if ( 0 < $number && intval(@count($series_groups)) > $number )
+ $series_groups = array_slice($series_groups, $offset, $number);
+
+ return $series_groups;
+
+}
+?>
diff --git a/addons/grouping/orgseries-grouping.css b/addons/grouping/orgseries-grouping.css
new file mode 100644
index 00000000..ba4ff1fa
--- /dev/null
+++ b/addons/grouping/orgseries-grouping.css
@@ -0,0 +1,16 @@
+.inner-sidebar #side-sortables {
+ width: 100%;
+}
+
+.inner-sidebar {
+ position: relative;
+ top: -220px;
+ right: 40px;
+ float: right;
+ width: 315px;
+}
+
+.series-group {
+ margin: 3px;
+ padding: 3px;
+}
diff --git a/addons/grouping/readme.txt b/addons/grouping/readme.txt
new file mode 100644
index 00000000..e152b325
--- /dev/null
+++ b/addons/grouping/readme.txt
@@ -0,0 +1,26 @@
+=== PublishPress Series Addon - Grouping ===
+Contributors: nerrad
+Tags: series, groups
+Requires at least: 3.7
+Tested up to: 4.8
+Stable tag: 2.2.3
+License: GPLv2
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+
+This addon gives you the ability to group series together by category.
+
+== Description ==
+One of the common case uses I've heard from people requesting this feature is the following: Say you are using your blog to write a book over a bunch of posts. The posts in each series are chapters in a book (chapter 1 is a post in a book). This way people can easily navigate through the different chapters. What if, however, the book is actually part of a series of books. In this case you'd want a way to present the Books as a part of a group. Aha! This is where PublishPress Series Grouping would come in to solve the problem.
+
+== Installation ==
+This add-on requires PublishPress Series Core to be installed and active.
+
+1. MAKE SURE YOU BACKUP YOUR WORDPRESS DATABASE (that\'s all in caps for a reason - nothing *should* go wrong but it\'s a good precaution nevertheless!!)
+1. Download the File (or use the built-in updater provided by WordPress)
+1. Extract to a folder in `../wp-content/plugins/`. The add-on folder can be named whatever you want but the default is \"organize-series-grouping\". The final structure would be something like this: `../wp-content/plugins/organize-series-grouping/--and all the plugin files/folders--`
+1. Activate the plugin on your WordPress plugins page.
+
+You can do the above or just use the new plugin install integrated in WordPress.
+
+== Changelog ==
+All change-log information for the plugin can be found at https://organizeseries.com/changelogs
\ No newline at end of file
diff --git a/addons/grouping/theme/primary/taxonomy-series_group.php b/addons/grouping/theme/primary/taxonomy-series_group.php
new file mode 100644
index 00000000..ada6e43e
--- /dev/null
+++ b/addons/grouping/theme/primary/taxonomy-series_group.php
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ name ?>
+
+
+
>
+
+ term_id); //gets the series data for the displayed group.
+ $series_args = array(
+ 'include' => $get_series,
+ 'number' => '',
+ 'order' => 'ASC',
+ 'hide_empty' => true
+ );
+ wp_serieslist_display(false, $series_args); //this is an organize-series template tag. List of series is output according to the serieslist_display template in series options.
+ ?>
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/grouping/theme/twenty-ten/groups-template.php b/addons/grouping/theme/twenty-ten/groups-template.php
new file mode 100644
index 00000000..6af90cc7
--- /dev/null
+++ b/addons/grouping/theme/twenty-ten/groups-template.php
@@ -0,0 +1,90 @@
+
+
+
+
+
+
>
+ 'DESC',
+ 'orderby' => 'term_id',
+ 'hide_empty' => false,
+ 'hierarchical' => true
+ );
+
+ //series listing args
+ $get_series_args = array(
+ 'hide_empty' => 1,
+ );
+
+ $groups = get_series_groups( $args ); //get series groups
+
+ foreach ( $groups as $group ) {
+
+ //does the group have children? If so, then let's get cracking...
+
+ $c_groups = _get_term_children($group->term_id, $groups, 'series_group');
+
+ if ( $c_groups ) {
+ ?>
+
+
name ?>
+
+
+
+
+
name; ?>
+
+ term_id, $get_series_args); //gets the series data for the displayed group.
+
+ $series_args = array(
+ 'include' => $get_series,
+ 'order' => 'DESC'
+ );
+ wp_serieslist_display(false, $series_args); //this is an organize-series template tag. List of series is output according to the serieslist_display template in series options.
+ ?>
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/grouping/uninstall.php b/addons/grouping/uninstall.php
new file mode 100644
index 00000000..73cdbf52
--- /dev/null
+++ b/addons/grouping/uninstall.php
@@ -0,0 +1,16 @@
+settings;
+$delete_grouping = $settings['kill_grouping_on_delete'];
+
+if ( $delete_grouping == 1 ) {
+ $type = 'series_grouping';
+ $query = "SELECT ID from $wpdb->posts WHERE post_type = '$type'";
+ $series_grouping_posts = $wpdb->get_results($query);
+ foreach ( $series_grouping_posts as $series ) {
+ wp_delete_post($series->ID,true);
+ }
+ delete_option('orgseries_grouping_import_completed'); //so if reactivated later it will work!
+ delete_option('orgseries_grouping_version'); //remove ALL traces!
+}
+?>
\ No newline at end of file
diff --git a/addons/publisher/css/series_im_sort_articles.css b/addons/publisher/css/series_im_sort_articles.css
index 199d390b..e790148e 100644
--- a/addons/publisher/css/series_im_sort_articles.css
+++ b/addons/publisher/css/series_im_sort_articles.css
@@ -1,7 +1,3 @@
-.pp-series-publisher-wrap .tablenav.top {
- display: none;
-}
-
.pp-series-publisher-wrap .inner-sidebar #side-sortables {
width: 300px;
}
diff --git a/addons/publisher/series-part-post-table.php b/addons/publisher/series-part-post-table.php
index b15419f8..a63cf133 100644
--- a/addons/publisher/series-part-post-table.php
+++ b/addons/publisher/series-part-post-table.php
@@ -172,6 +172,15 @@ protected function column_default($item, $column_name)
return !empty($item->$column_name) ? $item->$column_name : '—';
}
+ /**
+ * Message to be displayed when there are no items
+ *
+ * @since 3.1.0
+ */
+ public function no_items() {
+ _e( 'There are no posts in this series.', 'organize-series' );
+ }
+
/**
* The checkbox column
*
diff --git a/addons/publisher/series-publish-post-table.php b/addons/publisher/series-publish-post-table.php
index 041f22e0..cd43ed51 100644
--- a/addons/publisher/series-publish-post-table.php
+++ b/addons/publisher/series-publish-post-table.php
@@ -37,6 +37,15 @@ protected function get_table_classes()
return parent::get_table_classes();
}
+ /**
+ * Message to be displayed when there are no items
+ *
+ * @since 3.1.0
+ */
+ public function no_items() {
+ _e( 'There are no unpublished posts in this series.', 'organize-series' );
+ }
+
/**
* Show single row item
*
@@ -65,6 +74,7 @@ public function get_columns()
'categories' => esc_html__('Categories', 'organize-series'),
'tags' => esc_html__('Tags', 'organize-series'),
'post_status' => esc_html__('Status', 'organize-series'),
+ 'series_part' => esc_html__('Order', 'organize-series'),
'series_preview' => esc_html__('Preview', 'organize-series'),
];
@@ -78,10 +88,13 @@ public function get_table_data(){
$series_posts = [];
if ($series_id) {
+ $per_page = $this->get_items_per_page('pp_series_publisher_per_page', 20);
+ $current_page = $this->get_pagenum();
+
$arg = array(
'post_status' => ['future', 'draft', 'pending'],
- 'posts_per_page' => -1,
- 'no_found_rows' => true,
+ 'paged' => $current_page,
+ 'posts_per_page' => $per_page,
'tax_query' => array(
'relation' => 'AND',
array(
@@ -90,14 +103,145 @@ public function get_table_data(){
'terms' => array($series_id)
)
),
+ 'meta_query' => array(
+ "relation" => "or",
+ 'part_field_sort_value' => array(
+ 'key' => $meta_key,
+ 'type'=> 'NUMERIC'
+ ),
+ 'part_field_sort' => array(
+ 'key' => $meta_key,
+ 'compare' => 'NOT EXISTS',
+ 'type'=> 'NUMERIC'
+ ),
+ ),
+ 'orderby' => array(
+ 'part_field_sort' => 'ASC'
+ ),
);
+
+ /**
+ * Handle category filter
+ */
+ if ((!empty($_REQUEST['cat'])) && $category = sanitize_text_field($_REQUEST['cat'])) {
+ $arg['tax_query'][] = [
+ 'taxonomy' => 'category',
+ 'field' => 'slug',
+ 'terms' => array($category)
+ ];
+ }
+
+ /**
+ * Handle search
+ */
+ if ((!empty($_REQUEST['s'])) && $search = sanitize_text_field($_REQUEST['s'])) {
+ $arg['s'] = $search;
+ }
+
$series_query = new WP_Query($arg);
- $series_posts = $series_query->posts;
+
+ return ['posts'=> $series_query->posts, 'counts'=> $series_query->found_posts];
}
return $series_posts;
}
+ /**
+ * Returns the count of records in the database.
+ *
+ * @return null|string
+ */
+ public static function record_count()
+ {
+ return $this->get_table_data()['counts'];
+ }
+
+
+ /**
+ * Add custom filter to tablenav
+ *
+ * @param string $which
+ */
+ protected function extra_tablenav( $which ) {
+
+ if ( 'top' === $which ) {
+
+ $selected_category = (!empty($_REQUEST['cat'])) ? sanitize_text_field($_REQUEST['cat']) : '';
+ ?>
+
+ ID, SERIES_PART_KEY, true);
+
+ if(empty(trim($series_part))){
+ $series_part_output = esc_html__('(Currently has no Part number)', 'organize-series');
+ }else{
+ $series_part_output = $series_part;
+ }
+
+ return $series_part_output;
+ }
+
/**
* The title column
*
@@ -294,42 +459,30 @@ protected function get_bulk_actions()
*/
public function prepare_items()
{
+
/**
* First, lets decide how many records per page to show
*/
- $per_page = $this->get_items_per_page(str_replace('-', '_', $this->screen->id . '_per_page'), 999);
-
+ $per_page = $this->get_items_per_page('pp_series_publisher_per_page', 20);
/**
* Fetch the data
*/
- $data = $this->get_table_data();
-
- /**
- * Pagination.
- */
+ $results = $this->get_table_data();
+ $data = $results['posts'];
+ $total_items = $results['counts'];
$current_page = $this->get_pagenum();
- $total_items = count($data);
-
-
- /**
- * The WP_List_Table class does not handle pagination for us, so we need
- * to ensure that the data is trimmed to only the current page. We can use
- * array_slice() to
- */
- $data = array_slice($data, (($current_page - 1) * $per_page), $per_page);
/**
* Now we can add the data to the items property, where it can be used by the rest of the class.
*/
$this->items = $data;
-
/**
* We also have to register our pagination options & calculations.
*/
$this->set_pagination_args([
'total_items' => $total_items, //calculate the total number of items
- 'per_page' => $per_page, //determine how many items to show on a page
+ 'per_page' => $per_page, //determine how many items to show on a page
'total_pages' => ceil($total_items / $per_page) //calculate the total number of pages
]);
}
diff --git a/addons/publisher/series_im_admin_main.php b/addons/publisher/series_im_admin_main.php
index 84e53dfb..c6ef6290 100644
--- a/addons/publisher/series_im_admin_main.php
+++ b/addons/publisher/series_im_admin_main.php
@@ -4,87 +4,23 @@