\t
').insertAfter(this.$el),$(document.body).on("keyup",function(e){dropdown.open&&"Escape"===e.key&&dropdown.close()}).on("keydown",function(e){!dropdown.open||e.altKey||e.metaKey||e.ctrlKey||e.shiftKey||e.preventDefault(),dropdown.open&&-1<[" ","Enter","Tab"].indexOf(e.key)&&0\t\t\t\t'+this.$el.data("label")+':\t\t\t
\t\t\t\t
'+icon+'
\t\t\t
");$item.data("option",$option),"buy"===action?placeholders.push($item):$list.append($item)}}),0'+$option.data("title")+("activate"===action?' '+($dropdown.data("label-activate")||"Activate")+"":"")+("install"===action?' '+($dropdown.data("label-install")||"Install")+"":"")+'\t\t
\t\t'+$option.data("description")+"
\t\t\t
\t ');$(placeholders).each(function(i,el){$available.find(".view-dropdown-list-available__options").append(el)}),$list.append($available)}this.refresh()},ViewDropDown.prototype.toggle=function(){this.open=!this.open,this.refresh(),this.open&&this.focusActive()},ViewDropDown.prototype.focusActive=function(){this.$options_list.find("div.view-dropdown-list-item--active").focus()},ViewDropDown.prototype.close=function(){this.open=!1,this.refresh()},ViewDropDown.prototype.refresh=function(){this.$wrapper.toggleClass("view-dropdown--open",this.open);var value=this.$el.val(),$option=this.$el.find('option[value="'+value+'"]'),title=$option[0]?.innerText||"Select an option",icon="";$option.data("icon")&&(icon='\t\t\t\t\t\t'+($dropdown.data("label-available")||"Available")+'\t\t
\t\t\t\t
').insertAfter(this.$el),$(document.body).on("keyup",function(e){dropdown.open&&"Escape"===e.key&&dropdown.close()}).on("keydown",function(e){!dropdown.open||e.altKey||e.metaKey||e.ctrlKey||e.shiftKey||e.preventDefault(),dropdown.open&&-1<[" ","Enter","Tab"].indexOf(e.key)&&0\t\t\t\t'+this.$el.data("label")+':\t\t\t
\t\t\t\t
'+icon+'
\t\t\t
");id.data("option",$option),"buy"===action?placeholders.push(id):$list.append(id)}}),0'+$option.data("title")+("activate"===action?' '+($dropdown.data("label-activate")||"Activate")+"":"")+("install"===action?' '+($dropdown.data("label-install")||"Install")+"":"")+'\t\t
\t\t'+$option.data("description")+"
\t\t\t
\t ');$(placeholders).each(function(i,el){$available.find(".view-dropdown-list-available__options").append(el)}),$list.append($available)}this.refresh()},ViewDropDown.prototype.toggle=function(){this.open=!this.open,this.refresh(),this.open&&this.focusActive()},ViewDropDown.prototype.focusActive=function(){this.$options_list.find("div.view-dropdown-list-item--active").focus()},ViewDropDown.prototype.close=function(){this.open=!1,this.refresh()},ViewDropDown.prototype.refresh=function(){this.$wrapper.toggleClass("view-dropdown--open",this.open);var value=this.$el.val(),$option=this.$el.find('option[value="'+value+'"]'),title=$option[0]?.innerText||"Select an option",icon="",dropdown=($option.data("icon")&&(icon='\t\t\t\t\t\t'+($dropdown.data("label-available")||"Available")+'\t\t
\t\t\t'+gvGlobals.label_publisherror+"
'+gvGlobals.label_publisherror+"
\n\t\t\t\t\t\t'.concat((0,d.__)("Map is not available in the Block preview","gk-gravityview"),"\n\t\t\t\t\t
")})),/gv-datatables/.test(e)&&p(t.querySelectorAll("table.gv-datatables")).forEach((function(e){var t=document.createElement("tbody");t.innerHTML='\n\t\t\t\t\t\n\t\t\t\t\t\t'.concat((0,d.__)("Map is not available in the Block preview","gk-gravityview"),"\n\t\t\t\t\t
")})),/gv-datatables/.test(e)&&p(t.querySelectorAll("table.gv-datatables")).forEach((function(e){var t=document.createElement("tbody");t.innerHTML='\n\t\t\t\t\t';
+ /**
+ * Can be used to insert additional HTML inside the
diff --git a/includes/admin/metaboxes/views/gravityview-navigation.php b/includes/admin/metaboxes/views/gravityview-navigation.php
index 1e75f15f8d..fa0fc58e7d 100644
--- a/includes/admin/metaboxes/views/gravityview-navigation.php
+++ b/includes/admin/metaboxes/views/gravityview-navigation.php
@@ -16,14 +16,31 @@
foreach ( $metaboxes as $metabox ) {
$class = ! isset( $class ) ? 'nav-tab-active' : '';
+ if ( $metabox->extra_nav_class ) {
+ $class .= ' ' . gravityview_sanitize_html_class( (string) $metabox->extra_nav_class );
+ }
?>
before the metabox is rendered.
+ *
+ * @since 2.26
+ *
+ * @action `gk/gravityview/metabox/content/before`
+ *
+ * @param GravityView_Metabox_Tab $metabox Current GravityView_Metabox_Tab object.
+ */
+ do_action( 'gk/gravityview/metabox/content/before', $metabox );
+
$metabox->render( $post );
+ /**
+ * Can be used to insert additional HTML inside the
\ No newline at end of file
+ after the metabox is rendered.
+ *
+ * @since 2.26
+ *
+ * @action `gk/gravityview/metabox/content/after`
+ *
+ * @param GravityView_Metabox_Tab $metabox Current GravityView_Metabox_Tab object.
+ */
+ do_action( 'gk/gravityview/metabox/content/after', $metabox );
+
echo '
';
}
?>
-
+
diff --git a/includes/class-admin-views.php b/includes/class-admin-views.php
index 4790d167c6..fe73f1cc4a 100644
--- a/includes/class-admin-views.php
+++ b/includes/class-admin-views.php
@@ -1172,6 +1172,7 @@ function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
+
+
+
+
+
+
+
+
+
+ %s%s',
+ esc_url( $buy_now_link ),
+ // translators: %s is the plugin title.
+ esc_html( sprintf( __( 'Learn more about %s…', 'gk-gravityview' ), $title ) ),
+ esc_html__( 'This link opens in a new window.', 'gk-gravityview' )
+ );
+ } ?>
+
+
+ %2$s',
+ esc_url( $button_href ),
+ esc_html( $button_text ),
+ implode( ' ', $attributes ),
+ );
+ } else {
+ printf(
+ '%s%s',
+ esc_url( $buy_now_link ),
+ esc_html( $button_text ),
+ esc_html__( 'This link opens in a new window.', 'gk-gravityview' )
+ );
+ }
+ ?>
+
+
esc_html__( 'There was an error loading dynamic content.', 'gk-gravityview' ),
'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gk-gravityview' ),
'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gk-gravityview' ),
+ 'discard_unsaved_changes' => __( 'You have unsaved changes. Continuing will discard them. Are you sure you want to proceed?', 'gk-gravityview' ),
'foundation_licenses_router' => array_merge(
GravityKitFoundation::ajax_router()->get_ajax_params( 'licenses' ),
array(
diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php
index aa3eb74fce..5a6f47a62e 100644
--- a/includes/class-admin-welcome.php
+++ b/includes/class-admin-welcome.php
@@ -286,6 +286,7 @@ public function changelog_screen() {
+
+ Added
-
+
+
2.26 on August 8, 2024
+ +This update resolves various issues, including compatibility with Yoast SEO, improves performance through enhanced View entries caching, and adds new functionality.
+ +🚀 Added
+ +-
+
- Ability to modify the entry creator’s information on the Edit Entry screen. +
- Merge tag modifier for formatting Date and Time fields (e.g.,
{Date Field:1:format:Y-m-d}).
+ - Placeholders in View Settings to inform you that additional functionality is available. +
✨ Improved
+ +-
+
- The "Sort By" option in the GravityView Gutenberg block now offers a dropdown selection of fields instead of requiring manual entry of the field ID. +
- Caching of View entries to prevent unnecessary database queries. Thanks, Shehroz! +
🐛 Fixed
+ +-
+
- Timeout issue when rendering a page/post with GravityView Gutenberg blocks when Yoast SEO is active. +
- View editor fields added to the Single or Edit Entry layouts inheriting options from the View type set in the Multiple Entries layout. +
- An issue in the Search Bar widget configuration where adding a Date field caused the search mode ("any" and "all") to no longer be toggleable. +
[gv_entry_link]shortcode not rendering inside the Custom HTML block.
+
🔧 Updated
+ +-
+
- Foundation and TrustedLogin to versions 1.2.17 and 1.8.0, respectively. +
💻 Developer Updates
+ +-
+
- Added:
gk/gravityview/feature/upgrade/disabledfilter to disable the functionality placeholders. Returntrueto disable the placeholders.
+ - Added:
gk/gravityview/metabox/content/beforeandgk/gravityview/metabox/content/afteractions, triggered before and after the View metabox is rendered.
+
2.25 on June 5, 2024
This update improves how entries are automatically marked as "Read" and adds a new View setting to control this functionality.
@@ -360,50 +402,6 @@ public function changelog_screen() {gk/gravityview/field/is-read/label filter to change the "Is Read" field's "Read" and "Unread" labels.2.23 on May 17, 2024
- -This update adds support for Nested Forms' entry meta, addresses several bugs, including critical ones, and improves GravityKit's Settings and Manage Your Kit screens.
- -🚀 Added
- --
-
- Support for Gravity Wiz's Gravity Forms Nested Forms entry meta (parent form and entry IDs, child form field ID) in the View editor and merge tags. -
✨ Improved
- --
-
- The "Add All Fields" button in the View editor now adds fields in their correct form order. -
🐛 Fixed
- --
-
- Export link View widget would cause a fatal error during multi-word searches. -
- Fatal error when the search bar is configured with a Gravity Flow field and the Gravity Flow plugin is not active. -
- Duplicating entries no longer fails to refresh the entry list when View-based caching is enabled. -
- View cache not being invalidated when updating entries on a form joined using the Multiple Forms extension. -
- Number field output now respects the form field's format settings, such as decimals and currency. -
🔧 Updated
- -Foundation to version 1.2.14.
- --
-
- Added an option to subscribe to GravityKit's newsletter from the Manage Your Kit screen. -
- Added a setting in GravityKit > Settings > GravityKit to specify the GravityKit menu position in the Dashboard. -
- Improved internal check for product updates that could still interfere with third-party plugin updates. Thanks, Aaron! -
- Fixed a bug that prevented WordPress from loading third-party plugin translations after their updates. Thanks, Jérôme! -
- Success message now shows correct product name after activation/deactivation. -
💻 Developer Updates
- --
-
- Added
gk/gravityview/entry/approval-link/paramsfilter to modify entry approval link parameters.
-
-
@@ -475,12 +473,12 @@ public function credits_screen() {
Zack Katz
+Zack Katz
Project Lead & Developer
; ?>)
Zack has been developing WordPress plugins since 2008 and has been a huge Gravity Forms fan from the start. Zack is co-owner of GravityKit and he lives with his wife in Leverett, Massachusetts. He can’t wait for the next episode of ATP or The Flop House podcasts.
Vlad K.
-Core Developer
+Head of Development
; ?>)
Vlad is GravityKit’s lead developer. Known for his versatility, Vlad handles both front-end and back-end programming, as well as testing and DevOps. He lives in Ottawa, Canada, and frequently travels the world in pursuit of unique experiences that fuel his creativity and broaden his worldview.
-
@@ -490,6 +488,12 @@ public function credits_screen() {
Rafael Bennemann
+Rafael Bennemann
Support Specialist
; ?>)
Rafael dedicated most of his adult life to helping people and companies take their ideas to the web, first as a developer and now as a Customer Advocate at GravityKit. He will do his best to help you too, all the while sipping a Spritz Veneziano in Northern Italy, where he currently lives with his family.
Content Creator
; ?>)
Casey is GravityKit’s resident content creator. He’s been a WordPress lover ever since launching his first blog more than 6 years ago. Casey has lived and worked in London and Beijing, but feels most at home in Cape Town, South Africa, where he’s originally from.
+
Doeke Norg
+Senior Developer
+With almost 20 years of experience in PHP, there are few things Doeke doesn’t know about our favourite programming language. He lives with his family in The Netherlands, and spends his time designing elaborate, but maintainable code. He also writes a blog about software design in PHP.
+diff --git a/includes/class-gravityview-entry-link-shortcode.php b/includes/class-gravityview-entry-link-shortcode.php index 0eff217ade..dab70ad456 100644 --- a/includes/class-gravityview-entry-link-shortcode.php +++ b/includes/class-gravityview-entry-link-shortcode.php @@ -133,6 +133,10 @@ private function shortcode( $atts, $content = null, $context = 'gv_entry_link' ) $this->view_id = empty( $this->settings['view_id'] ) ? GravityView_View::getInstance()->getViewId() : absint( $this->settings['view_id'] ); + if ( empty( $this->view_id ) && get_the_ID() ) { + $this->view_id = get_the_ID(); + } + if ( empty( $this->view_id ) ) { gravityview()->log->error( 'A View ID was not defined and we are not inside a View' ); diff --git a/includes/class-gravityview-merge-tags.php b/includes/class-gravityview-merge-tags.php index d83716e639..6b60f6d248 100644 --- a/includes/class-gravityview-merge-tags.php +++ b/includes/class-gravityview-merge-tags.php @@ -6,6 +6,14 @@ * @since 1.8.4 */ class GravityView_Merge_Tags { + /** + * Microcache for merge tag modifiers. + * + * @since 2.26 + * + * @var array[] + */ + private static $merge_tag_modifiers = []; /** * @since 1.8.4 @@ -20,12 +28,44 @@ public function __construct() { * @since 1.8.4 */ private function add_hooks() { - /** @see GFCommon::replace_variables_prepopulate */ add_filter( 'gform_replace_merge_tags', array( 'GravityView_Merge_Tags', 'replace_gv_merge_tags' ), 10, 7 ); // Process after 10 priority add_filter( 'gform_merge_tag_filter', array( 'GravityView_Merge_Tags', 'process_modifiers' ), 20, 5 ); + + add_filter( 'gform_pre_replace_merge_tags', [ $this, 'cache_merge_tag_modifiers' ] ); + } + + /** + * Caches merge tag modifiers to preserve their case sensitivity. + * This is necessary because {@see GFCommon::replace_field_variable()) applies + * `strtolower()` to the modifier and causes issues where case is expected, + * such as date formatting (e.g., `format:Y-m-d`). + * + * @since 2.26 + * + * @param string $text Text with merge tags. + * + * @return string + */ + public function cache_merge_tag_modifiers( $text ) { + // Regex pattern taken from GFCommon::replace_variables(). + preg_match_all( '/{[^{]*?:(\d+(\.\w+)?)(:(.*?))?}/mi', $text, $matches, PREG_SET_ORDER ); + + if ( ! $matches ) { + return $text; + } + + foreach ( $matches as $match ) { + $modifier = $match[4] ?? ''; + + if ( $modifier ) { + self::$merge_tag_modifiers[ strtolower( $modifier ) ] = $modifier; + } + } + + return $text; } /** @@ -50,6 +90,9 @@ public static function process_modifiers( $value, $merge_tag, $modifier, $field, return $value; } + // Retrieve the original case-sensitive modifier. + $modifier = self::$merge_tag_modifiers[ strtolower( $modifier ) ] ?? $modifier; + // matching regex => the value is the method to call to replace the value. $gv_modifiers = array( 'maxwords:(\d+)' => 'modifier_maxwords', @@ -70,6 +113,7 @@ public static function process_modifiers( $value, $merge_tag, $modifier, $field, 'ucfirst' => 'modifier_strings', 'ucwords' => 'modifier_strings', 'wptexturize' => 'modifier_strings', + 'format' => 'modifier_format', ); $modifiers = explode( ',', $modifier ); @@ -97,7 +141,7 @@ public static function process_modifiers( $value, $merge_tag, $modifier, $field, } // The called method is passed the raw value and the full matches array - $return = self::$method( $return, $matches, $value, $field ); + $return = self::$method( $return, $matches, $value, $field, $passed_modifier ); break; } } @@ -123,6 +167,27 @@ public static function process_modifiers( $value, $merge_tag, $modifier, $field, return $return; } + /** + * Converts date and time values to the format modifier. + * + * @since 2.26 + * + * @param string $raw_value + * @param array $matches + * @param string $value + * @param array $field + * @param string $modifier + * + * @return string + */ + private static function modifier_format( $raw_value, $matches, $value, $field, $modifier ) { + if ( ( $field instanceof GF_Field_Date || $field instanceof GF_Field_Time ) && $modifier ) { + return self::format_date( $raw_value, $modifier ); + } + + return $raw_value; + } + /** * Convert Date field values to timestamp int * @@ -566,7 +631,7 @@ private static function get_format_from_modifiers( $exploded, $backup = '' ) { // If there's a "format:[php date format string]" date format, grab it if ( false !== $format_key_index && isset( $exploded[ $format_key_index + 1 ] ) ) { // Return escaped colons placeholder - $return = str_replace( '|COLON|', ':', $exploded[ $format_key_index + 1 ] ); + $return = str_replace( '|COLON|', ':', implode( ':', array_slice( $exploded, $format_key_index + 1 ) ) ); } return $return; diff --git a/includes/extensions/entry-notes/assets/js/entry-notes.min.js b/includes/extensions/entry-notes/assets/js/entry-notes.min.js index 9df66d3d5f..346f1208d1 100644 --- a/includes/extensions/entry-notes/assets/js/entry-notes.min.js +++ b/includes/extensions/entry-notes/assets/js/entry-notes.min.js @@ -1 +1 @@ -!function($){var gv_notes={selectors:{wrapper:".gv-notes",bulk_form:".gv-notes-list",bulk_toggle:".gv-notes-toggle",bulk_checkbox:'input[name="note[]"]',bulk_submit:".gv-notes-delete",add_note_form:"form.gv-note-add",add_note_submit:".gv-add-note-submit",add_note_content:"textarea[name=gv-note-content]",email_wrapper:".gv-note-email-container",email_to_wrapper:".gv-note-to-container",email_select:".gv-note-email-to",email_to_custom_wrapper:".gv-note-to-custom-container"},init:function(){$(gv_notes.selectors.wrapper).each(function(){gv_notes.setup_checkboxes($(this)),$(gv_notes.selectors.bulk_toggle,$(this)).on("change",gv_notes.toggle_all),$(gv_notes.selectors.bulk_form,$(this)).on("submit",gv_notes.delete_notes),$(gv_notes.selectors.email_select,$(this)).on("change",gv_notes.email_fields_toggle).trigger("change"),$(gv_notes.selectors.add_note_form,$(this)).on("submit",gv_notes.add_note).find("textarea").on("keydown",gv_notes.command_enter)})},setup_checkboxes:function($container){$(gv_notes.selectors.bulk_checkbox,$container).on("change",gv_notes.toggle_disable_delete).shiftSelectable().filter(":first-child").trigger("change")},toggle_disable_delete:function(){$container=$(this).parents(gv_notes.selectors.wrapper),$checkboxes=$(gv_notes.selectors.bulk_checkbox,$container),$(gv_notes.selectors.bulk_submit,$container).prop("disabled",0===$checkboxes.filter(":checked").length)},email_fields_toggle:function($email_container){var val=$(this).val(),$email_container=$($email_container.target).parents(gv_notes.selectors.wrapper).find(gv_notes.selectors.email_wrapper);$(gv_notes.selectors.email_to_wrapper,$email_container).toggle(""!==val),$(gv_notes.selectors.email_to_custom_wrapper,$email_container).toggle("custom"===val)},command_enter:function(e){13==e.keyCode&&e.metaKey&&$(e.currentTarget).parents("form.gv-note-add").submit()},toggle_all:function(e){$container=$(this).parents(gv_notes.selectors.wrapper),$checkboxes=$(gv_notes.selectors.bulk_checkbox,$container),$checkboxes.prop("checked",$(this).prop("checked")).trigger("change")},delete_notes:function(e){e.preventDefault();var $container=$(e.target).parent(gv_notes.selectors.wrapper),$checked=$(gv_notes.selectors.bulk_checkbox,$container).filter(":checked");if(0===$checked.length)return console.log("No notes were checked"),!1;if(!window.confirm(GVNotes.text.delete_confirm))return console.log("Just kidding. Please do not delete me!"),!1;var $submit=$container.find(gv_notes.selectors.bulk_submit);$.ajax({url:GVNotes.ajaxurl,isLocal:!0,method:"POST",beforeSend:function(){$container.addClass("gv-processing-note"),$submit.data("value",$submit.html()).prop("disabled",!0).html(GVNotes.text.processing)},data:{action:"gv_delete_notes",data:$(this).serialize()}}).done(function(data,textStatus,jqXHR){$submit.prop("disabled",!1).html($submit.data("value")),$container.removeClass("gv-processing-note"),!0===data.success?$checked.parents("tr.gv-note").addClass("gv-note-deleted").animate({height:"0",opacity:"0"},"slow",function(){$(this).remove(),0===$("tr.gv-note",$container).length&&$container.removeClass("gv-has-notes").addClass("gv-no-notes"),$container.find(gv_notes.selectors.bulk_toggle).prop("checked",!1),gv_notes.setup_checkboxes($container)}):gv_notes.show_message($submit,data.data.error)})},show_message:function($insert_after,message,message_class){var css_class="gv-note-message",message_class=!1===message_class?"gv-note-success":"gv-note-error";$message=$insert_after.next("."+css_class).length?$insert_after.next("."+css_class):$("",{class:css_class}),$message.insertAfter($insert_after).attr("class",css_class+" "+message_class).html(message).fadeIn("fast").delay(3e3).fadeOut("fast").on("click",function(){$(this).fadeOut("fast")})},add_note:function(e){e.preventDefault();var $container=$(e.target).parent(gv_notes.selectors.wrapper),$submit=$container.find(gv_notes.selectors.add_note_submit),$inputs=$container.find(":input").not("[type=hidden]");if(""!==$container.find(gv_notes.selectors.add_note_content).val().trim())return $.ajax({url:GVNotes.ajaxurl,isLocal:!0,method:"POST",beforeSend:function(){$container.addClass("gv-processing-note"),$inputs.prop("disabled","disabled"),$submit.data("value",$submit.html()).html(GVNotes.text.processing)},data:{action:"gv_note_add",data:$(this).serialize()}}).done(function(data,textStatus,jqXHR){$submit.html($submit.data("value")),$inputs.prop("disabled",!1),$container.removeClass("gv-processing-note"),!0===data.success?($container.removeClass("gv-no-notes").addClass("gv-has-notes"),$(data.data.html).hide().appendTo($("table tbody",$container)).fadeIn(),gv_notes.setup_checkboxes($container),$inputs.val("").trigger("change"),gv_notes.show_message($submit,GVNotes.text.note_added,!1)):gv_notes.show_message($submit,data.data.error)}),!1;gv_notes.show_message($submit,GVNotes.text.error_empty_note)}};$.fn.shiftSelectable=function(){var lastChecked,$boxes=this;return $boxes.click(function(end){var start;lastChecked=(lastChecked&&end.shiftKey&&(start=$boxes.index(this),end=$boxes.index(lastChecked),$boxes.slice(Math.min(start,end),Math.max(start,end)+1).prop("checked",lastChecked.checked).trigger("change")),this)}),this},gv_notes.init(),window.gvEntryNotes=gv_notes}(jQuery); \ No newline at end of file +!function($){var gv_notes={selectors:{wrapper:".gv-notes",bulk_form:".gv-notes-list",bulk_toggle:".gv-notes-toggle",bulk_checkbox:'input[name="note[]"]',bulk_submit:".gv-notes-delete",add_note_form:"form.gv-note-add",add_note_submit:".gv-add-note-submit",add_note_content:"textarea[name=gv-note-content]",email_wrapper:".gv-note-email-container",email_to_wrapper:".gv-note-to-container",email_select:".gv-note-email-to",email_to_custom_wrapper:".gv-note-to-custom-container"},init:function(){$(gv_notes.selectors.wrapper).each(function(){gv_notes.setup_checkboxes($(this)),$(gv_notes.selectors.bulk_toggle,$(this)).on("change",gv_notes.toggle_all),$(gv_notes.selectors.bulk_form,$(this)).on("submit",gv_notes.delete_notes),$(gv_notes.selectors.email_select,$(this)).on("change",gv_notes.email_fields_toggle).trigger("change"),$(gv_notes.selectors.add_note_form,$(this)).on("submit",gv_notes.add_note).find("textarea").on("keydown",gv_notes.command_enter)})},setup_checkboxes:function($container){$(gv_notes.selectors.bulk_checkbox,$container).on("change",gv_notes.toggle_disable_delete).shiftSelectable().filter(":first-child").trigger("change")},toggle_disable_delete:function(){$container=$(this).parents(gv_notes.selectors.wrapper),$checkboxes=$(gv_notes.selectors.bulk_checkbox,$container),$(gv_notes.selectors.bulk_submit,$container).prop("disabled",0===$checkboxes.filter(":checked").length)},email_fields_toggle:function(e){var val=$(this).val(),e=$(e.target).parents(gv_notes.selectors.wrapper).find(gv_notes.selectors.email_wrapper);$(gv_notes.selectors.email_to_wrapper,e).toggle(""!==val),$(gv_notes.selectors.email_to_custom_wrapper,e).toggle("custom"===val)},command_enter:function(e){13==e.keyCode&&e.metaKey&&$(e.currentTarget).parents("form.gv-note-add").submit()},toggle_all:function(e){$container=$(this).parents(gv_notes.selectors.wrapper),($checkboxes=$(gv_notes.selectors.bulk_checkbox,$container)).prop("checked",$(this).prop("checked")).trigger("change")},delete_notes:function(e){e.preventDefault();var $submit,$container=$(e.target).parent(gv_notes.selectors.wrapper),$checked=$(gv_notes.selectors.bulk_checkbox,$container).filter(":checked");return 0===$checked.length?(console.log("No notes were checked"),!1):window.confirm(GVNotes.text.delete_confirm)?($submit=$container.find(gv_notes.selectors.bulk_submit),void $.ajax({url:GVNotes.ajaxurl,isLocal:!0,method:"POST",beforeSend:function(){$container.addClass("gv-processing-note"),$submit.data("value",$submit.html()).prop("disabled",!0).html(GVNotes.text.processing)},data:{action:"gv_delete_notes",data:$(this).serialize()}}).done(function(data,textStatus,jqXHR){$submit.prop("disabled",!1).html($submit.data("value")),$container.removeClass("gv-processing-note"),!0===data.success?$checked.parents("tr.gv-note").addClass("gv-note-deleted").animate({height:"0",opacity:"0"},"slow",function(){$(this).remove(),0===$("tr.gv-note",$container).length&&$container.removeClass("gv-has-notes").addClass("gv-no-notes"),$container.find(gv_notes.selectors.bulk_toggle).prop("checked",!1),gv_notes.setup_checkboxes($container)}):gv_notes.show_message($submit,data.data.error)})):(console.log("Just kidding. Please do not delete me!"),!1)},show_message:function($insert_after,message,is_error){var css_class="gv-note-message",is_error=!1===is_error?"gv-note-success":"gv-note-error";($message=$insert_after.next("."+css_class).length?$insert_after.next("."+css_class):$("",{class:css_class})).insertAfter($insert_after).attr("class",css_class+" "+is_error).html(message).fadeIn("fast").delay(3e3).fadeOut("fast").on("click",function(){$(this).fadeOut("fast")})},add_note:function(e){e.preventDefault();var $container=$(e.target).parent(gv_notes.selectors.wrapper),$submit=$container.find(gv_notes.selectors.add_note_submit),$inputs=$container.find(":input").not("[type=hidden]");if(""!==$container.find(gv_notes.selectors.add_note_content).val().trim())return $.ajax({url:GVNotes.ajaxurl,isLocal:!0,method:"POST",beforeSend:function(){$container.addClass("gv-processing-note"),$inputs.prop("disabled","disabled"),$submit.data("value",$submit.html()).html(GVNotes.text.processing)},data:{action:"gv_note_add",data:$(this).serialize()}}).done(function(data,textStatus,jqXHR){$submit.html($submit.data("value")),$inputs.prop("disabled",!1),$container.removeClass("gv-processing-note"),!0===data.success?($container.removeClass("gv-no-notes").addClass("gv-has-notes"),$(data.data.html).hide().appendTo($("table tbody",$container)).fadeIn(),gv_notes.setup_checkboxes($container),$inputs.val("").trigger("change"),gv_notes.show_message($submit,GVNotes.text.note_added,!1)):gv_notes.show_message($submit,data.data.error)}),!1;gv_notes.show_message($submit,GVNotes.text.error_empty_note)}};$.fn.shiftSelectable=function(){var lastChecked,$boxes=this;return $boxes.click(function(evt){var end;lastChecked=(lastChecked&&evt.shiftKey&&(evt=$boxes.index(this),end=$boxes.index(lastChecked),$boxes.slice(Math.min(evt,end),Math.max(evt,end)+1).prop("checked",lastChecked.checked).trigger("change")),this)}),this},gv_notes.init(),window.gvEntryNotes=gv_notes}(jQuery); \ No newline at end of file diff --git a/includes/fields/class-gravityview-field-approval.php b/includes/fields/class-gravityview-field-approval.php index 181ecdcf37..dd5f7b2337 100644 --- a/includes/fields/class-gravityview-field-approval.php +++ b/includes/fields/class-gravityview-field-approval.php @@ -19,7 +19,7 @@ class GravityView_Field_Entry_Approval extends GravityView_Field { var $group = 'gravityview'; - var $contexts = array( 'single', 'multiple' ); + var $contexts = array( 'single', 'multiple', 'edit' ); var $icon = 'dashicons-yes-alt'; @@ -83,6 +83,42 @@ private function add_hooks() { add_filter( 'gravityview/field_output/html', array( $this, 'maybe_prevent_field_render' ), 10, 2 ); add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 2 ); + + add_filter( 'gravityview/edit_entry/form_fields', array( $this, 'show_field_in_edit_entry' ), 10, 3 ); + + add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_edit_entry' ), 10, 3 ); + + } + + /** + * Updates approval field after edit entry save. + * + * @since 2.26 + * + * @param array $form Gravity Forms form array + * @param int $entry_id Gravity Forms Entry ID + * @param GravityView_Edit_Entry_Render $Edit_Entry_Render + * + * @return void + */ + public function update_edit_entry( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) { + if ( ! $form || ! $entry_id ) { + return; + } + + $unique_id = crc32( 'is_approved' ); + + if ( ! isset( $_POST[ 'input_' . $unique_id ] ) ) { + return; + } + + $approval_status = \GV\Utils::_POST( 'input_' . $unique_id ); + + if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { + $approval_status = GravityView_Entry_Approval_Status::UNAPPROVED; + } + + GravityView_Entry_Approval::update_approved( $entry_id, $approval_status, $form['id'] ); } /** @@ -227,7 +263,7 @@ public function enqueue_and_localize_script() { */ public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) { - if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) { + if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' === $context ) { $entry_default_fields[ "{$this->name}" ] = array( 'label' => $this->label, 'desc' => $this->description, @@ -279,6 +315,77 @@ public static function get_css_class( $approved_status ) { return esc_attr( "gv-approval-{$approved_key}" ); } + + /** + * Adds the GravityView Approval Entries field to the Edit Entry form + * + * @since 2.26 + * + * @param GF_Field[] $fields Gravity Forms form fields + * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration + * @param array $form GF Form array (`fields` key modified to have only fields configured to show in Edit Entry) + * + * @return GF_Field[] If Custom Content field exists, returns fields array with the fields inserted. Otherwise, returns unmodified fields array. + */ + public function show_field_in_edit_entry( $fields, $edit_fields = null, $form = array() ) { + // Not configured; show all fields. + if ( is_null( $edit_fields ) ) { + return $fields; + } + + $new_fields = array(); + $i = 0; + + $entry = gravityview()->request->is_edit_entry( $form['id'] ); + $_entry = $entry->as_entry(); + + foreach ( (array) $edit_fields as $id => $edit_field ) { + if ( 'entry_approval' !== $edit_field['id'] ) { + if ( isset( $fields[ $i ] ) ) { + $new_fields[] = $fields[ $i ]; + } + ++$i; + continue; + } + + $label = ( $edit_field['custom_label'] ? $edit_field['custom_label'] : __( 'Approve Entries', 'gk-gravityview' ) ); + + if ( ! $edit_field['show_label'] ) { + $label = ''; + } + + $unique_id = crc32( 'is_approved' ); + + $value = ( $_entry['is_approved'] ? (int) $_entry['is_approved'] : GravityView_Entry_Approval_Status::UNAPPROVED ); + $value = $_POST[ "input_{$unique_id}" ] ?? $value; + + $field_data = array( + 'id' => $unique_id, + 'custom_id' => $id, + 'label' => $label, + 'choices' => array( + array( + 'text' => __( 'Approve', 'gk-gravityview' ), + 'value' => GravityView_Entry_Approval_Status::APPROVED, + ), + array( + 'text' => __( 'Disapprove', 'gk-gravityview' ), + 'value' => GravityView_Entry_Approval_Status::DISAPPROVED, + ), + array( + 'text' => __( 'Reset Approval', 'gk-gravityview' ), + 'value' => GravityView_Entry_Approval_Status::UNAPPROVED, + ), + ), + 'defaultValue' => (int) $value, + 'cssClass' => $edit_field['custom_class'], + ); + + $new_fields[] = new GF_Field_Radio( $field_data ); + } + return $new_fields; + } + } new GravityView_Field_Entry_Approval(); diff --git a/includes/fields/class-gravityview-field-is-read.php b/includes/fields/class-gravityview-field-is-read.php index 0220599b11..99bf07fcb7 100644 --- a/includes/fields/class-gravityview-field-is-read.php +++ b/includes/fields/class-gravityview-field-is-read.php @@ -42,7 +42,7 @@ class GravityView_Field_Is_Read extends GravityView_Field { /** * An array of entry IDs that have been marked as read during the request. * - * @since TBD + * @since 2.25 * * @var array */ @@ -91,7 +91,7 @@ private function add_hooks() { /** * Adds the "Mark Entry As Read" setting to the View settings. * - * @since TBD + * @since 2.25 * * @param array $settings The settings. * @@ -117,7 +117,7 @@ public function modify_single_entry_view_settings( $settings ) { /** * Marks the entry as read if the user has `gravityview_edit_entries` capability and the "Mark Entry As Read" View setting is enabled. * - * @since TBD + * @since 2.25 * * @return void */ diff --git a/includes/fields/class-gravityview-field-time.php b/includes/fields/class-gravityview-field-time.php index 997d671fe8..b1471441ac 100644 --- a/includes/fields/class-gravityview-field-time.php +++ b/includes/fields/class-gravityview-field-time.php @@ -65,8 +65,10 @@ public function __construct() { add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 ); add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); + } + /** * Modify the sort key for the time field so it can be parsed by the query filter * diff --git a/includes/load-plugin-and-theme-hooks.php b/includes/load-plugin-and-theme-hooks.php index 37428f3141..6491470ec3 100644 --- a/includes/load-plugin-and-theme-hooks.php +++ b/includes/load-plugin-and-theme-hooks.php @@ -17,6 +17,8 @@ // Abstract class require $include_path . 'abstract-gravityview-plugin-and-theme-hooks.php'; +require $include_path . 'class-gravityview-object-placeholder.php'; +require $include_path . 'class-gravityview-feature-upgrade.php'; $plugin_hooks_files = glob( $include_path . 'class-gravityview-plugin-hooks-*.php' ); diff --git a/includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php b/includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php index 3fc812237f..4139cceec6 100644 --- a/includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php +++ b/includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php @@ -132,12 +132,23 @@ protected function is_active() { private function maybe_add_hooks() { if ( ! $this->is_active() ) { + + $this->add_inactive_hooks(); + return; } $this->add_hooks(); } + /** + * Add hooks when the plugin / theme is active. + * + * @since 2.26 + */ + protected function add_inactive_hooks(): void { + } + /** * Add filters for meta key and script/style handles, if defined. * @@ -178,8 +189,7 @@ protected function add_hooks() { * @return array Array of features associated with a functional area of the edit screen, merged with existing values */ public function merge_post_type_support( $supports = array(), $is_hierarchical = false ) { - $supports = array_merge( $this->post_type_support, $supports ); - return $supports; + return array_merge( $this->post_type_support, $supports ); } /** diff --git a/includes/plugin-and-theme-hooks/class-gravityview-feature-upgrade.php b/includes/plugin-and-theme-hooks/class-gravityview-feature-upgrade.php new file mode 100644 index 0000000000..de5fb41b9d --- /dev/null +++ b/includes/plugin-and-theme-hooks/class-gravityview-feature-upgrade.php @@ -0,0 +1,62 @@ + +
' . esc_html__( 'Plugin update required.', 'gk-gravityview' ) . '
'; - $message .= esc_html_x( 'You are using [plugin] [version] that is incompatible with the current version of GravityView. Please [link]update [plugin][/link] to the latest version.', 'Placeholders inside [] are not to be translated.', 'gk-gravityview' ); - - $message = strtr( - $message, - array( - '[version]' => GRAVITYVIEW_MAPS_VERSION, - '[link]' => '', - '[plugin]' => 'GravityView Maps', - '[/link]' => '', - ) - ); - - $notices[] = array( - 'class' => 'error', - 'message' => $message, - 'dismiss' => false, - ); - - return $notices; + if ( defined( 'GRAVITYVIEW_MAPS_VERSION' ) && + version_compare( GRAVITYVIEW_MAPS_VERSION, '1.8', '<' ) + ) { + /** + * @since 2.16 + * + * @param array $notices + * + * @return array $notices, with a new notice about Maps compatibility added. + */ + add_filter( + 'gravityview/admin/notices', + function ( $notices ) { + + $message = '' . esc_html__( 'Plugin update required.', 'gk-gravityview' ) . '
'; + $message .= esc_html_x( 'You are using [plugin] [version] that is incompatible with the current version of GravityView. Please [link]update [plugin][/link] to the latest version.', 'Placeholders inside [] are not to be translated.', 'gk-gravityview' ); + + $message = strtr( + $message, + [ + '[version]' => GRAVITYVIEW_MAPS_VERSION, + '[link]' => '', + '[plugin]' => 'GravityView Maps', + '[/link]' => '', + ] + ); + + $notices[] = [ + 'class' => 'error', + 'message' => $message, + 'dismiss' => false, + ]; + + return $notices; + } + ); + } + + parent::add_hooks(); + } + + /** + * @inheritDoc + * + * @since 2.26 + */ + protected function add_inactive_hooks(): void { + add_action( 'add_meta_boxes', [ $this, 'register_metabox_placeholder' ] ); + } + + /** + * Returns the icon for the GravityView Maps layout. + * + * @since 2.26 + * + * @return string The SVG icon. + */ + private function get_placeholder_icon(): string { + return <<| '+gvSearchVar.label_searchfield+' | '+gvSearchVar.label_label+' | '+gvSearchVar.label_inputtype+' |
|---|
| '+gvSearchVar.label_searchfield+' | '+gvSearchVar.label_label+' | '+gvSearchVar.label_inputtype+' |
|---|