Changeset 2718757

Timestamp:

05/05/2022 07:47:13 PM (4 years ago)

Author:

claygriffiths

Message:

Update to version 3.1.27 from GitHub

Location:

gravity-forms-custom-post-types

Files:

• tags/3.1.27 (copied) (copied from gravity-forms-custom-post-types/trunk)
• tags/3.1.27/gfcptaddon.php (modified) (2 diffs)
• tags/3.1.27/gfcptaddonbase.php (modified) (3 diffs)
• tags/3.1.27/readme.txt (modified) (1 diff)
• trunk/gfcptaddon.php (modified) (2 diffs)
• trunk/gfcptaddonbase.php (modified) (3 diffs)
• trunk/readme.txt (modified) (1 diff)

gravity-forms-custom-post-types/tags/3.1.27/gfcptaddon.php

@@ -4 +4 @@
 Plugin URI: https://gravitywiz.com/
 Description: Map your Gravity-Forms-generated posts to a custom post type and/or custom taxonomies.
-Version: 3.1.26
+Version: 3.1.27
 Author: Gravity Wiz
 Author URI: https://gravitywiz.com/
@@ -17 +17 @@
     private static $name                     = 'Gravity Forms + Custom Post Types';
     private static $slug                     = 'GFCPTAddon';
-    private static $version                  = '3.1.26';
+    private static $version                  = '3.1.27';
     private static $min_gravityforms_version = '1.9.3';
 

gravity-forms-custom-post-types/tags/3.1.27/gfcptaddonbase.php

@@ -442 +442 @@
             }
 
-            if ( ! array_key_exists( "errors", $terms ) ) {
+            if ( ! isset( $terms->errors ) ) {
                 foreach ( $terms as $term ) {
                     $choices[] = array( 'value' => $term->term_id, 'text' => $term->name );
@@ -593 +593 @@
         }
 
+        /**
+         * @param $value
+         * @param \GF_Field $field
+         * @param $entry
+         * @param $form
+         *
+         * @return mixed|string
+         */
         function display_term_name_on_entry_detail( $value, $field, $entry, $form ) {
+
+            if ( $field->populateTaxonomy && in_array( $field->get_input_type(), array( 'checkbox', 'multiselect' ) ) ) {
+                $values = GFFormsModel::get_lead_field_value( $entry, $field );
+                if ( $field->get_input_type() === 'multiselect' ) {
+                    $values = json_decode( $values );
+                }
+                foreach ( $values as &$_value ) {
+                    $_value = $this->get_term_name( $_value, $field );
+                }
+                return $field->get_value_entry_detail( $values );
+            }
+
             return $this->get_term_name( $value, $field );
         }
 
-        function display_term_name_on_entry_list( $value, $form_id, $field_id ) {
+        function display_term_name_on_entry_list( $value, $form_id, $field_id, $entry = null ) {
 
             if ( is_numeric( $field_id ) ) {
-                $field = GFFormsModel::get_field( GFAPI::get_form( $form_id ), $field_id );
-                $value = $this->get_term_name( $value, $field );
+                $form  = GFAPI::get_form( $form_id );
+                $value = $this->display_term_name_on_entry_detail( $value, GFAPI::get_field( $form, $field_id ), $entry, $form );
             }
 
@@ -607 +627 @@
         }
 
-        function display_term_name_on_export( $value, $form_id, $field_id ) {
-            return $this->display_term_name_on_entry_list( $value, $form_id, $field_id );
+        function display_term_name_on_export( $value, $form_id, $field_id, $entry = null ) {
+            return $this->display_term_name_on_entry_list( $value, $form_id, $field_id, $entry );
         }
 

gravity-forms-custom-post-types/tags/3.1.27/readme.txt

@@ -81 +81 @@
 
 == Changelog ==
+
+= 3.1.27 =
+* Fixed an issue where term names were not displayed for multi-value fields like Checkboxes and Multi-selects in the Entry List and Entry Detail views.
 
 = 3.1.26 =

gravity-forms-custom-post-types/trunk/gfcptaddon.php

@@ -4 +4 @@
 Plugin URI: https://gravitywiz.com/
 Description: Map your Gravity-Forms-generated posts to a custom post type and/or custom taxonomies.
-Version: 3.1.26
+Version: 3.1.27
 Author: Gravity Wiz
 Author URI: https://gravitywiz.com/
@@ -17 +17 @@
     private static $name                     = 'Gravity Forms + Custom Post Types';
     private static $slug                     = 'GFCPTAddon';
-    private static $version                  = '3.1.26';
+    private static $version                  = '3.1.27';
     private static $min_gravityforms_version = '1.9.3';
 

gravity-forms-custom-post-types/trunk/gfcptaddonbase.php

@@ -442 +442 @@
             }
 
-            if ( ! array_key_exists( "errors", $terms ) ) {
+            if ( ! isset( $terms->errors ) ) {
                 foreach ( $terms as $term ) {
                     $choices[] = array( 'value' => $term->term_id, 'text' => $term->name );
@@ -593 +593 @@
         }
 
+        /**
+         * @param $value
+         * @param \GF_Field $field
+         * @param $entry
+         * @param $form
+         *
+         * @return mixed|string
+         */
         function display_term_name_on_entry_detail( $value, $field, $entry, $form ) {
+
+            if ( $field->populateTaxonomy && in_array( $field->get_input_type(), array( 'checkbox', 'multiselect' ) ) ) {
+                $values = GFFormsModel::get_lead_field_value( $entry, $field );
+                if ( $field->get_input_type() === 'multiselect' ) {
+                    $values = json_decode( $values );
+                }
+                foreach ( $values as &$_value ) {
+                    $_value = $this->get_term_name( $_value, $field );
+                }
+                return $field->get_value_entry_detail( $values );
+            }
+
             return $this->get_term_name( $value, $field );
         }
 
-        function display_term_name_on_entry_list( $value, $form_id, $field_id ) {
+        function display_term_name_on_entry_list( $value, $form_id, $field_id, $entry = null ) {
 
             if ( is_numeric( $field_id ) ) {
-                $field = GFFormsModel::get_field( GFAPI::get_form( $form_id ), $field_id );
-                $value = $this->get_term_name( $value, $field );
+                $form  = GFAPI::get_form( $form_id );
+                $value = $this->display_term_name_on_entry_detail( $value, GFAPI::get_field( $form, $field_id ), $entry, $form );
             }
 
@@ -607 +627 @@
         }
 
-        function display_term_name_on_export( $value, $form_id, $field_id ) {
-            return $this->display_term_name_on_entry_list( $value, $form_id, $field_id );
+        function display_term_name_on_export( $value, $form_id, $field_id, $entry = null ) {
+            return $this->display_term_name_on_entry_list( $value, $form_id, $field_id, $entry );
         }
 

gravity-forms-custom-post-types/trunk/readme.txt

@@ -81 +81 @@
 
 == Changelog ==
+
+= 3.1.27 =
+* Fixed an issue where term names were not displayed for multi-value fields like Checkboxes and Multi-selects in the Entry List and Entry Detail views.
 
 = 3.1.26 =