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.

Sign up for GitHub

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

Jump to bottom

Entity Assistance Tab UI + some AJAX #17023

Merged
merged 5 commits into from
Jun 18, 2024
Merged

Entity Assistance Tab UI + some AJAX #17023

merged 5 commits into from
Jun 18, 2024

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
Merged
cedric-anne
cedric-anne requested changes May 16, 2024
View reviewed changes
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
cedric-anne
cedric-anne requested changes May 21, 2024
View reviewed changes
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
cedric-anne
cedric-anne requested changes Jun 4, 2024
View reviewed changes
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
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
src/Entity.php Show resolved Hide resolved
src/Entity.php Show resolved Hide resolved
@trasher trasher requested a review from cedric-anne June 18, 2024 07:06
trasher
trasher approved these changes Jun 18, 2024
View reviewed changes
Copy link
Contributor

@trasher trasher left a comment

Choose a reason for hiding this comment

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

That's not parts of the project I know well; but so far I see no major issues.

cedric-anne
cedric-anne requested changes Jun 18, 2024
View reviewed changes
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.

Almost good for me.

  1. On root entity, it is not possible to choose an empty value in Model for automatic transfer on inventories
    image

  2. The "Enforce 2FA" option in child entities does not show the inherited value:
    image

@cedric-anne cedric-anne merged commit c79648e into glpi-project:main Jun 18, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trasher trasher trasher approved these changes

@orthagh orthagh orthagh approved these changes

@cedric-anne cedric-anne cedric-anne approved these changes

Assignees
No one assigned
Labels
ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@cconard96 @trasher @orthagh @cedric-anne