-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Cleanup search exports code #21112
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
Merged
cedric-anne
merged 15 commits into
glpi-project:11.0/bugfixes
from
trasher:fix/search-exports
Oct 1, 2025
Merged
Cleanup search exports code #21112
cedric-anne
merged 15 commits into
glpi-project:11.0/bugfixes
from
trasher:fix/search-exports
Oct 1, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d20c263
to
6276cdc
Compare
trasher
commented
Sep 30, 2025
cedric-anne
requested changes
Sep 30, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests are failing.
trasher
commented
Sep 30, 2025
1639eca
to
410afe9
Compare
cedric-anne
previously approved these changes
Sep 30, 2025
trasher
commented
Sep 30, 2025
It's no longer possible to use something else than HTML here
Move ExportSearchOutput::displayData() in the class that really uses it (NamesListSearchOutput)
There is no problem a few lines up, I do not understand why it gives an error
410afe9
to
66fc220
Compare
…pected output type" This reverts commit 66fc220.
cedric-anne
approved these changes
Oct 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since we switched to phpspreadsheet; the way to generate PDF and CSV no longer uses internal
show*
methods.But those ones have been kept, empty. This cause code that will never work to just output nothgin, without any error.
This PR remove those inherited methods; clean them where not needed, and ensure we do not try to use them outside of HTML output.
Since finally the
ExportSearchOutput::displayData()
was only used once inNamesListSearchOutput
, I moved it and clean all call to emptyshow*
methods.I've removed the usage of generic
Search::show*
(those ones should certainly be deprecated - to be discussed) because most of the time it was used with an explicit HTML output, or indirectly in a HTML only display context.Probably to be reviewed per commit.