← All changes | back/Controllers/EntitySelectController.php +5 -16 trunk → 11.1.0 View file →

		@@ -64,9 +64,8 @@
64	64	}
65	65
66	66	if ('list' === $entity) {
67	67	$entityParams['columns'][] = 'description';
68		- $entityParams['columns'][] = 'active';
69	68	}
70	69
71	70	if (!acym_isAdmin()) {
72	71	$entityParams['creator_id'] = acym_currentUserId();
		@@ -85,21 +84,14 @@
85	84	private function formatEntites(array &$availableEntity, string $entity): void
86	85	{
87	86	if ($entity === 'list') {
88	87	foreach ($availableEntity['elements'] as $key => $element) {
89		- $availableEntity['elements'][$key]->color = '<i style="color: '.esc_attr(
90		- $element->color ?? '#0079d3'
91		- ).'" class="acym_subscription acymicon-circle">';
92		- $availableEntity['elements'][$key]->name = esc_html($element->name);
93		- if (empty($element->active)) {
94		- $availableEntity['elements'][$key]->name .= '<span class="acym__entity_select__list__inactive">'.esc_html(
95		- acym_translation('ACYM_INACTIVE')
96		- ).'</span>';
97		- }
	88	+ $availableEntity['elements'][$key]->color = '<i style="color: '.$element->color.'" class="acym_subscription acymicon-circle">';
98	89	if (!empty($element->description)) {
99	90	ob_start();
100		- acym_info(['textShownInTooltip' => esc_html($element->description)]);
101		- $availableEntity['elements'][$key]->name .= ob_get_clean();
	91	+ acym_info(['textShownInTooltip' => $element->description]);
	92	+ $tooltip = ob_get_clean();
	93	+ $availableEntity['elements'][$key]->name = $element->name.$tooltip;
102	94	}
103	95	}
104	96	} elseif ($entity === 'user') {
105	97	foreach ($availableEntity['elements'] as $key => $element) {
		@@ -105,12 +97,9 @@
105	97	foreach ($availableEntity['elements'] as $key => $element) {
106	98	ob_start();
107	99	acym_info(['textShownInTooltip' => '<i class="acymicon-circle-o-notch acymicon-spin"></i>']);
108	100	$tooltip = ob_get_clean();
109		- $availableEntity['elements'][$key]->name = esc_html($element->name ?? '');
110		- $availableEntity['elements'][$key]->email = esc_html($element->email).'<span class="acym__hover__user_info" data-id="'.esc_attr(
111		- $element->id
112		- ).'">
	101	+ $availableEntity['elements'][$key]->email = $element->email.'<span class="acym__hover__user_info" data-id="'.esc_attr($availableEntity['elements'][$key]->id).'">
113	102	'.$tooltip.'
114	103	</span>';
115	104	}
116	105	}