From 0cde90f048d17d4b5978b22113a1d8cc6f425abc Mon Sep 17 00:00:00 2001 From: Ivan Kristianto Date: Thu, 15 Jun 2017 20:34:25 +0700 Subject: [PATCH 1/4] allow to filter query_args in post_select ajax call --- inc/fields/class-shortcode-ui-field-post-select.php | 3 +++ js/src/views/edit-attribute-field-post-select.js | 1 + 2 files changed, 4 insertions(+) diff --git a/inc/fields/class-shortcode-ui-field-post-select.php b/inc/fields/class-shortcode-ui-field-post-select.php index b49d3b23..c720e7f3 100644 --- a/inc/fields/class-shortcode-ui-field-post-select.php +++ b/inc/fields/class-shortcode-ui-field-post-select.php @@ -85,6 +85,7 @@ public function action_wp_ajax_shortcode_ui_post_field() { $nonce = isset( $_GET['nonce'] ) ? sanitize_text_field( $_GET['nonce'] ) : null; $requested_shortcode = isset( $_GET['shortcode'] ) ? sanitize_text_field( $_GET['shortcode'] ) : null; $requested_attr = isset( $_GET['attr'] ) ? sanitize_text_field( $_GET['attr'] ) : null; + $postid = isset( $_GET['postid'] ) ? absint( $_GET['postid'] ) : 0; $response = array( 'items' => array(), @@ -135,6 +136,8 @@ public function action_wp_ajax_shortcode_ui_post_field() { $query_args['ignore_sticky_posts'] = true; } + $query_args = apply_filters( 'shortcode_ui_post_field_query_args', $query_args, $postid ); + $query = new WP_Query( $query_args ); foreach ( $query->posts as $post_id ) { diff --git a/js/src/views/edit-attribute-field-post-select.js b/js/src/views/edit-attribute-field-post-select.js index 60eb0100..50e862a4 100644 --- a/js/src/views/edit-attribute-field-post-select.js +++ b/js/src/views/edit-attribute-field-post-select.js @@ -10,6 +10,7 @@ sui.views.editAttributeFieldPostSelect = sui.views.editAttributeSelect2Field.ext ajaxData: { action : 'shortcode_ui_post_field', nonce : shortcodeUiPostFieldData.nonce, + postid : $( '#post_ID' ).val(), }, events: { From b210b40af132e18269f91f7be7cb3d242901cb94 Mon Sep 17 00:00:00 2001 From: Ivan Kristianto Date: Thu, 15 Jun 2017 20:35:32 +0700 Subject: [PATCH 2/4] compile script --- js/build/shortcode-ui.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/build/shortcode-ui.js b/js/build/shortcode-ui.js index 1b50d79c..6587ef49 100644 --- a/js/build/shortcode-ui.js +++ b/js/build/shortcode-ui.js @@ -1073,6 +1073,7 @@ sui.views.editAttributeFieldPostSelect = sui.views.editAttributeSelect2Field.ext ajaxData: { action : 'shortcode_ui_post_field', nonce : shortcodeUiPostFieldData.nonce, + postid : $( '#post_ID' ).val(), }, events: { From 5632cb3a1159702d7b224990a3e69f0ca97242b6 Mon Sep 17 00:00:00 2001 From: Ivan Kristianto Date: Tue, 20 Jun 2017 11:43:43 +0700 Subject: [PATCH 3/4] move postID params to parent class select2-fields --- js/build/shortcode-ui.js | 6 +++--- js/src/views/edit-attribute-field-post-select.js | 3 +-- js/src/views/select2-field.js | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/build/shortcode-ui.js b/js/build/shortcode-ui.js index 6587ef49..3e7356a8 100644 --- a/js/build/shortcode-ui.js +++ b/js/build/shortcode-ui.js @@ -1072,8 +1072,7 @@ sui.views.editAttributeFieldPostSelect = sui.views.editAttributeSelect2Field.ext ajaxData: { action : 'shortcode_ui_post_field', - nonce : shortcodeUiPostFieldData.nonce, - postid : $( '#post_ID' ).val(), + nonce : shortcodeUiPostFieldData.nonce }, events: { @@ -1775,7 +1774,8 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( { var request = { include : _preselected, shortcode : this.shortcode.get( 'shortcode_tag'), - attr : this.model.get( 'attr' ) + attr : this.model.get( 'attr' ), + postid : $( '#post_ID' ).val() }; $.get( ajaxurl, $.extend( request, this.ajaxData ), diff --git a/js/src/views/edit-attribute-field-post-select.js b/js/src/views/edit-attribute-field-post-select.js index 50e862a4..bf881b70 100644 --- a/js/src/views/edit-attribute-field-post-select.js +++ b/js/src/views/edit-attribute-field-post-select.js @@ -9,8 +9,7 @@ sui.views.editAttributeFieldPostSelect = sui.views.editAttributeSelect2Field.ext ajaxData: { action : 'shortcode_ui_post_field', - nonce : shortcodeUiPostFieldData.nonce, - postid : $( '#post_ID' ).val(), + nonce : shortcodeUiPostFieldData.nonce }, events: { diff --git a/js/src/views/select2-field.js b/js/src/views/select2-field.js index 5ef5c860..3b386c86 100644 --- a/js/src/views/select2-field.js +++ b/js/src/views/select2-field.js @@ -43,7 +43,8 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( { var request = { include : _preselected, shortcode : this.shortcode.get( 'shortcode_tag'), - attr : this.model.get( 'attr' ) + attr : this.model.get( 'attr' ), + postid : $( '#post_ID' ).val() }; $.get( ajaxurl, $.extend( request, this.ajaxData ), From 3d4c59614ffd983ec489fa52b58021b7e22a5004 Mon Sep 17 00:00:00 2001 From: Ivan Kristianto Date: Fri, 7 Jul 2017 15:31:14 +0700 Subject: [PATCH 4/4] move the postids args to correct place in select2field --- js/build/shortcode-ui.js | 6 +++--- js/src/views/select2-field.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/build/shortcode-ui.js b/js/build/shortcode-ui.js index 3e7356a8..a67779f6 100644 --- a/js/build/shortcode-ui.js +++ b/js/build/shortcode-ui.js @@ -1774,8 +1774,7 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( { var request = { include : _preselected, shortcode : this.shortcode.get( 'shortcode_tag'), - attr : this.model.get( 'attr' ), - postid : $( '#post_ID' ).val() + attr : this.model.get( 'attr' ) }; $.get( ajaxurl, $.extend( request, this.ajaxData ), @@ -1848,7 +1847,8 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( { s : params.term, // search term page : params.page, shortcode : self.shortcode.get( 'shortcode_tag'), - attr : self.model.get( 'attr' ) + attr : self.model.get( 'attr' ), + postid : $( '#post_ID' ).val() }, self.ajaxData ); }, processResults: function (response, params) { diff --git a/js/src/views/select2-field.js b/js/src/views/select2-field.js index 3b386c86..b433bedd 100644 --- a/js/src/views/select2-field.js +++ b/js/src/views/select2-field.js @@ -43,8 +43,7 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( { var request = { include : _preselected, shortcode : this.shortcode.get( 'shortcode_tag'), - attr : this.model.get( 'attr' ), - postid : $( '#post_ID' ).val() + attr : this.model.get( 'attr' ) }; $.get( ajaxurl, $.extend( request, this.ajaxData ), @@ -117,7 +116,8 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( { s : params.term, // search term page : params.page, shortcode : self.shortcode.get( 'shortcode_tag'), - attr : self.model.get( 'attr' ) + attr : self.model.get( 'attr' ), + postid : $( '#post_ID' ).val() }, self.ajaxData ); }, processResults: function (response, params) {