Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Entity Assistance Tab UI + some AJAX #17023

Open
wants to merge 13 commits into
base: main
Choose a base branch
from

Conversation

cconard96
Copy link
Contributor

Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
  • Migrated Assistance tab of Entity form to Twig.
  • Removed specific AJAX files for ticket and change satisfaction surveys in favor of using ajax/commonitilsatisfaction.php directly.
  • Moved HTML from ajax/commonitilsatisfaction.php to Twig.
  • Minor UI sanitization/Twig/Cleanup work in some other AJAX files.
  • Addition of concat_ws to QueryFunction class

@cconard96 cconard96 added the ui label Apr 27, 2024
@cconard96 cconard96 mentioned this pull request Apr 29, 2024
Copy link
Member

@cedric-anne cedric-anne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase to solve conflicts.

src/Entity.php Outdated Show resolved Hide resolved
src/Entity.php Outdated Show resolved Hide resolved
src/Entity.php Outdated Show resolved Hide resolved
src/Entity.php Outdated Show resolved Hide resolved
templates/pages/admin/entity/survey_config.html.twig Outdated Show resolved Hide resolved
src/Entity.php Outdated Show resolved Hide resolved
templates/pages/admin/entity/assistance.html.twig Outdated Show resolved Hide resolved
src/Entity.php Show resolved Hide resolved
src/Entity.php Show resolved Hide resolved
src/Entity.php Show resolved Hide resolved
src/Entity.php Show resolved Hide resolved
@cedric-anne cedric-anne self-requested a review May 29, 2024 06:32
Copy link
Member

@cedric-anne cedric-anne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a fresh GLPI installation,

src/Entity.php Show resolved Hide resolved
'suppliers_as_private' => $entity->getInheritedValueBadge('suppliers_as_private'),
'anonymize_support_agents' => $entity->getInheritedValueBadge('anonymize_support_agents'),
'display_users_initials' => $entity->getInheritedValueBadge('display_users_initials'),
'contracts_id_default' => $entity->getInheritedValueBadge('contracts_id_default', 'contracts_strategy_default'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When nothing in selected in the parent entity, maybe a None value should be displayed as inherited value.
image

src/Entity.php Show resolved Hide resolved
false
),
'entities_id_software' => $entity->getInheritedValueBadge('entities_id_software', 'entities_strategy_software'),
'transfers_id' => $entity->getInheritedValueBadge('transfers_id', 'transfers_strategy'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a fresh install, on the root entity, the displayed value is -----, but the current value is, I think, No automatic transfer.
image

On a child entity, the displayed value is -----, but the current value is, I think, Inheritence of the parent entity.
image

false,
false
),
'entities_id_software' => $entity->getInheritedValueBadge('entities_id_software', 'entities_strategy_software'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a child entity, the displayed value is -----, but the current value is, I think, Inheritence of the parent entity.
image

src/Entity.php Show resolved Hide resolved
'toadd' => $autopurge,
'unit' => 'day'
$inheritance_labels = [
'tickettemplates_id' => $entity->getInheritedLinkedValueBadge(TicketTemplate::class),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not know if nothing, -----, or None is the best label to display. Anyways, it should be done the same for all options.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants