GroupActionCollection: fixed group text action collision with another…

… datagrid
contributte · Jun 30, 2020 · 790b8fa · 790b8fa
1 parent 54f1c47
commit 790b8fa
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/GroupAction/GroupActionCollection.php b/src/GroupAction/GroupActionCollection.php
@@ -15,7 +15,7 @@
 class GroupActionCollection
 {
 
-	private const ID_ATTRIBUTE_PREFIX = 'group_action_item_';
+	private const ID_ATTRIBUTE_PREFIX = '_item_';
 
 	/**
 	 * @var array<GroupAction>
@@ -38,6 +38,7 @@ public function addToFormContainer(Container $container): void
 	{
 		/** @var Form $form */
 		$form = $container->lookup(Form::class);
+		$lookupPath = $container->lookupPath();
 		$translator = $form->getTranslator();
 		$main_options = [];
 
@@ -88,27 +89,27 @@ public function addToFormContainer(Container $container): void
 				if ($action->hasOptions()) {
 					if ($action instanceof GroupMultiSelectAction) {
 						$control = $container->addMultiSelect((string) $id, '', $action->getOptions());
-						$control->setAttribute('data-datagrid-multiselect-id', self::ID_ATTRIBUTE_PREFIX . $id);
+						$control->setAttribute('data-datagrid-multiselect-id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
 						$control->setAttribute('data-style', 'hidden');
 						$control->setAttribute('data-selected-icon-check', DataGrid::$iconPrefix . 'check');
 					} else {
 						$control = $container->addSelect((string) $id, '', $action->getOptions());
 					}
 
-					$control->setAttribute('id', self::ID_ATTRIBUTE_PREFIX . $id);
+					$control->setAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
 				}
 			} elseif ($action instanceof GroupTextAction) {
 				$control = $container->addText((string) $id, '');
 
-				$control->setAttribute('id', self::ID_ATTRIBUTE_PREFIX . $id)
+				$control->setAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
 					->addConditionOn($groupActionSelect, Form::EQUAL, $id)
 					->setRequired($translator->translate('ublaboo_datagrid.choose_input_required'))
 					->endCondition();
 
 			} elseif ($action instanceof GroupTextareaAction) {
 				$control = $container->addTextArea((string) $id, '');
 
-				$control->setAttribute('id', self::ID_ATTRIBUTE_PREFIX . $id)
+				$control->setAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
 					->addConditionOn($groupActionSelect, Form::EQUAL, $id)
 					->setRequired($translator->translate('ublaboo_datagrid.choose_input_required'));
 			}
@@ -131,7 +132,7 @@ public function addToFormContainer(Container $container): void
 		if ($main_options !== []) {
 			foreach (array_keys($this->groupActions) as $id) {
 				$groupActionSelect->addCondition(Form::EQUAL, $id)
-					->toggle(self::ID_ATTRIBUTE_PREFIX . $id);
+					->toggle($lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
 			}
 
 			$groupActionSelect->addCondition(Form::FILLED)