diff --git a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js index 77cd50eae0..3bf5aec18b 100644 --- a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js +++ b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js @@ -210,7 +210,8 @@ define([ ajax: { data: function (params) { return { - term: params.term + term: params.term, + page: params.page || 1 }; }, transport: function (options, success, failure) { @@ -223,6 +224,7 @@ define([ // Fetch available terms based on the list of taxonomies already fetched termsPromise = CommunicationComponent.getTerms({ search: options.data.term, + page: options.data.page, taxonomies: _.keys(taxonomies) }).then(function (terms) { return { @@ -248,7 +250,10 @@ define([ id: item.term_id }, item); } - ) + ), + pagination: { + more: data.terms.length === 100 + } }; } } diff --git a/assets/js/src/newsletter_editor/blocks/automatedLatestContentLayout.js b/assets/js/src/newsletter_editor/blocks/automatedLatestContentLayout.js index 1711982278..f6cfe7e398 100644 --- a/assets/js/src/newsletter_editor/blocks/automatedLatestContentLayout.js +++ b/assets/js/src/newsletter_editor/blocks/automatedLatestContentLayout.js @@ -205,7 +205,8 @@ define([ ajax: { data: function (params) { return { - term: params.term + term: params.term, + page: params.page || 1 }; }, transport: function (options, success, failure) { @@ -218,6 +219,7 @@ define([ // Fetch available terms based on the list of taxonomies already fetched termsPromise = CommunicationComponent.getTerms({ search: options.data.term, + page: options.data.page, taxonomies: _.keys(taxonomies) }).then(function (terms) { return { @@ -243,7 +245,10 @@ define([ id: item.term_id }, item); } - ) + ), + pagination: { + more: data.terms.length === 100 + } }; } } diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js index 1f8adfd5c7..9d7b886f8a 100644 --- a/assets/js/src/newsletter_editor/blocks/posts.js +++ b/assets/js/src/newsletter_editor/blocks/posts.js @@ -372,7 +372,8 @@ define([ ajax: { data: function (params) { return { - term: params.term + term: params.term, + page: params.page || 1 }; }, transport: function (options, success, failure) { @@ -385,6 +386,7 @@ define([ // Fetch available terms based on the list of taxonomies already fetched termsPromise = CommunicationComponent.getTerms({ search: options.data.term, + page: options.data.page, taxonomies: _.keys(taxonomies) }).then(function (terms) { return { @@ -410,7 +412,10 @@ define([ id: item.term_id }, item); } - ) + ), + pagination: { + more: data.terms.length === 100 + } }; } } diff --git a/lib/API/JSON/v1/AutomatedLatestContent.php b/lib/API/JSON/v1/AutomatedLatestContent.php index b3e56d7d35..33d4971498 100644 --- a/lib/API/JSON/v1/AutomatedLatestContent.php +++ b/lib/API/JSON/v1/AutomatedLatestContent.php @@ -43,7 +43,7 @@ class AutomatedLatestContent extends APIEndpoint { function getTerms($data = array()) { $taxonomies = (isset($data['taxonomies'])) ? $data['taxonomies'] : array(); $search = (isset($data['search'])) ? $data['search'] : ''; - $limit = (isset($data['limit'])) ? (int)$data['limit'] : 50; + $limit = (isset($data['limit'])) ? (int)$data['limit'] : 100; $page = (isset($data['page'])) ? (int)$data['page'] : 1; $args = array( 'taxonomy' => $taxonomies, @@ -56,8 +56,9 @@ class AutomatedLatestContent extends APIEndpoint { ); $args = Hooks::applyFilters('mailpoet_search_terms_args', $args); + $terms = WPPosts::getTerms($args); - return $this->successResponse(WPPosts::getTerms($args)); + return $this->successResponse(array_values($terms)); } function getPosts($data = array()) { @@ -90,4 +91,4 @@ class AutomatedLatestContent extends APIEndpoint { return $this->successResponse($rendered_posts); } -} \ No newline at end of file +}