RELEASE: 5.0.53

Author: eeteamcodebase

CHANGELOG.md

@@ -6,6 +6,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Releases
 
+### 5.0.53
+
+#### Added
+ - [Add PRINT_BUTTON_* shortcode (#2085)](https://github.com/eventespresso/cafe/pull/2085)
+
+#### Fixed
+ - [Fix Question Group Identifier On Save (#2046)](https://github.com/eventespresso/cafe/pull/2046)
+ - [Ensure Global Taxes are Displayed on Invoice (#2082)](https://github.com/eventespresso/cafe/pull/2082)
+
+#### Changed
+ - [Append the ticket name to the attendee in SPCO  (#2080)](https://github.com/eventespresso/cafe/pull/2080)
+ - [Upgrade wp-graphql to version v1-32-1 (#2057)](https://github.com/eventespresso/cafe/pull/2057)
+ - [Block Incompatible Add-ons From Reactivating (#1983)](https://github.com/eventespresso/cafe/pull/1983)
+
+
+
+
+
+
 ### 5.0.52
 
 #### Fixed

VERSION

@@ -1 +1 @@
-5.0.52
+5.0.53

admin_pages/registration_form/Registration_Form_Admin_Page.core.php

@@ -360,7 +360,11 @@ protected function _set_column_values_for(EEM_Base $model): array
         $column_values = [];
         // some initial checks for proper values.
         $QST_ID = $this->request->getRequestParam('QST_ID', 0, DataType::INT);
-        // if QST_admin_only, then no matter what QST_required is we disable.
+        $QSG_ID = $this->request->getRequestParam('QSG_ID', 0, DataType::INT);
+        if ($QSG_ID) {
+            $column_values['QSG_ID'] = $QSG_ID;
+        }
+        // if QST_admin_only, then no matter what QST_required is, we disable.
         $QST_admin_only = $this->request->getRequestParam('QST_admin_only', false, DataType::BOOL);
         if ($QST_admin_only) {
             $this->request->setRequestParam('QST_required', false);
@@ -380,13 +384,35 @@ protected function _set_column_values_for(EEM_Base $model): array
             $this->request->unSetRequestParam('QST_max', true);
         }
         foreach ($model->field_settings() as $fieldName => $settings) {
+            if (! $settings instanceof EE_Model_Field_Base) {
+                continue;
+            }
             switch($fieldName) {
                 case 'QSG_identifier':
-                    // basically if QSG_identifier is empty or not set
-                    if (! $this->request->getRequestParam('QSG_identifier', '', DataType::STRING)) {
-                        $QSG_name                    = $this->request->getRequestParam('QSG_name', '', DataType::STRING);
-                        $column_values[ $fieldName ] = sanitize_title($QSG_name) . '-' . uniqid('', true);
+                    $QSG_identifier = $this->request->getRequestParam('QSG_identifier', '', DataType::STRING);
+                    // use QSG_name if QSG_identifier is empty or not set
+                    if (empty($QSG_identifier)) {
+                        $QSG_identifier = $this->request->getRequestParam(
+                            'QSG_name',
+                            '',
+                            DataType::STRING
+                        );
+                    }
+                    if (empty($QSG_identifier)) {
+                        $column_values[ $fieldName ] = null;
+                        break;
                     }
+                    $QSG_identifier = sanitize_title($QSG_identifier);
+                    $where = ['QSG_identifier' => $QSG_identifier];
+                    if ($QSG_ID) {
+                        $where['QSG_ID'] = ['!=', $QSG_ID];
+                    }
+                    // check if identifier is already used
+                    if ($model->count([$where])) {
+                        // append hash to prevent collisions
+                        $QSG_identifier = "$QSG_identifier-" . uniqid();
+                    }
+                    $column_values[ $fieldName ] = $QSG_identifier;
                     break;
 
                 case 'QST_display_text':
@@ -789,6 +815,7 @@ public function get_questions(int $per_page = 10, int $current_page = 1, bool $c
      * @param bool $count
      * @return EE_Soft_Delete_Base_Class[]|int
      * @throws EE_Error
+     * @throws ReflectionException
      */
     public function get_trashed_questions(int $per_page, int $current_page = 1, bool $count = false)
     {

admin_pages/registration_form/templates/questions_main_meta_box.template.php

@@ -646,13 +646,28 @@ class=""
 
                 </td>
             </tr>
-            <?php
-            do_action('AHEE__questions_main_meta_box__template__after_table_form_table', $question);
-            ?>
+
+            <?php do_action('AHEE__questions_main_meta_box__template__after_table_form_table', $question); ?>
+
+            <tr>
+                <th></th>
+                <td>
+                    <span class="important-notice">
+                        <?php
+                        printf(
+                            esc_html__(
+                                'all fields marked with an asterisk (%1$s) are required',
+                                'event_espresso'
+                            ),
+                            '<span class="asterisk ee-required-text">*</span>'
+                        )
+                        ?>
+                    </span>
+                </td>
+            </tr>
+
         </tbody>
     </table>
-
-    <div class="clear"></div>
 </div>
 
     <?php