From a0ac63322b7645a5eca8b41e96fbca46eb141ae6 Mon Sep 17 00:00:00 2001 From: Daniel Mundra Date: Tue, 10 Sep 2024 12:43:15 -0700 Subject: [PATCH] Reverted changes to checkIndexEditingField and checkIndexEditing. Updated comment. --- .../src/Indexes/IndexFieldCallbacks.php | 4 ++-- .../src/Indexes/IndexFieldOperations.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/data_dictionary_widget/src/Indexes/IndexFieldCallbacks.php b/modules/data_dictionary_widget/src/Indexes/IndexFieldCallbacks.php index b2db7c85be..5e3cea9a85 100644 --- a/modules/data_dictionary_widget/src/Indexes/IndexFieldCallbacks.php +++ b/modules/data_dictionary_widget/src/Indexes/IndexFieldCallbacks.php @@ -227,8 +227,8 @@ public static function subIndexFormFieldAjax(array &$form, FormStateInterface $f } /** - * Ajax callback to return index fields fieldset with existing fields and - * Add Field button. + * Ajax callback to return index fields fieldset with existing fields and Add + * Field button. */ public static function subIndexFormExistingFieldAjax(array &$form, FormStateInterface $form_state) { $form["field_json_metadata"]["widget"][0]["indexes"]["field_collection"]["group"]["index"]["fields"]["add_row_button"]['#access'] = TRUE; diff --git a/modules/data_dictionary_widget/src/Indexes/IndexFieldOperations.php b/modules/data_dictionary_widget/src/Indexes/IndexFieldOperations.php index 1b3e75691f..a394fcc454 100644 --- a/modules/data_dictionary_widget/src/Indexes/IndexFieldOperations.php +++ b/modules/data_dictionary_widget/src/Indexes/IndexFieldOperations.php @@ -239,13 +239,13 @@ public static function createIndexOptions($op_index, $index_data_results, $index */ public static function checkIndexEditingField($indexKey, $op_index, $index_fields_being_modified) { $action_list = IndexFieldOperations::editIndexActions(); - if (isset($op_index[0]) && in_array($op_index[0], $action_list)) { - $indexKeyExplode = explode('_', $indexKey); - if (array_key_exists($indexKeyExplode[3], $index_fields_being_modified)) { - return TRUE; - } + $indexKeyExplode = explode("_", $indexKey); + if (isset($op_index[0]) && in_array($op_index[0], $action_list) && array_key_exists($indexKeyExplode[3], $index_fields_being_modified)) { + return TRUE; + } + else { + return FALSE; } - return FALSE; } /** @@ -256,11 +256,9 @@ public static function checkIndexEditing($indexKey, $op_index, $index_being_modi $op_index_string = implode('_', $op_index); if (str_contains($op_index_string, 'edit_index_key')) { $action_list = IndexFieldOperations::editIndexActions(); - if (isset($op_index[0]) && in_array($op_index[0], $action_list)) { - $indexKeyExplode = explode('_', $indexKey); - if (array_key_exists($indexKeyExplode[2], $index_being_modified)) { - return TRUE; - } + $indexKeyExplode = explode("_", $indexKey); + if (isset($op_index[0]) && in_array($op_index[0], $action_list) && array_key_exists($indexKeyExplode[2], $index_being_modified)) { + return TRUE; } } }