Repository navigation
Refactor: render the forms with Twig instead of echo #697
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
Open
Lainow
wants to merge
6
commits into
11.0/bugfixes
Choose a base branch
from
refactor/twig-instead-of-echo
base: 11.0/bugfixes
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d2dd1bd
Refactor: render the forms with Twig instead of echo
Lainow b84ae79
Update CHANGELOG
Lainow d2c04c2
Fix lint
Lainow 9d3e988
Keep the itemtype in the name of the additional information fields
Lainow a881784
Move the changelog entries to the unreleased section
Lainow eae890e
Review: rows of a type that is no longer injectable, reject a broken …
Lainow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * ------------------------------------------------------------------------- | ||
| * DataInjection plugin for GLPI | ||
| * ------------------------------------------------------------------------- | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This file is part of DataInjection. | ||
| * | ||
| * DataInjection is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * DataInjection is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with DataInjection. If not, see <http://www.gnu.org/licenses/>. | ||
| * ------------------------------------------------------------------------- | ||
| * @copyright Copyright (C) 2007-2023 by DataInjection plugin team. | ||
| * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html | ||
| * @link https://github.com/pluginsGLPI/datainjection | ||
| * ------------------------------------------------------------------------- | ||
| */ | ||
| use Glpi\Exception\Http\BadRequestHttpException; | ||
| use Symfony\Component\HttpFoundation\JsonResponse; | ||
|
|
||
| use function Safe\json_decode; | ||
|
|
||
| Html::header_nocache(); | ||
|
|
||
| Session::checkRight('plugin_datainjection_model', READ); | ||
|
|
||
| $itemtype = (string) ($_POST['itemtype'] ?? PluginDatainjectionInjectionType::NO_VALUE); | ||
| $primary_type = (string) ($_POST['primary_type'] ?? ''); | ||
| $called_by = (string) ($_POST['called_by'] ?? ''); | ||
|
|
||
| try { | ||
| $mapping_or_info = json_decode((string) ($_POST['mapping_or_info'] ?? ''), true); | ||
| } catch (JsonException) { | ||
| throw new BadRequestHttpException(); | ||
| } | ||
|
|
||
| if ( | ||
| !is_a($primary_type, CommonDBTM::class, true) | ||
| || ($itemtype !== PluginDatainjectionInjectionType::NO_VALUE && !is_a($itemtype, CommonDBTM::class, true)) | ||
| || !in_array($called_by, [PluginDatainjectionMapping::class, PluginDatainjectionInfo::class], true) | ||
| || !isset($mapping_or_info['models_id'], $mapping_or_info['value']) | ||
| ) { | ||
| throw new BadRequestHttpException(); | ||
| } | ||
|
|
||
| // Reads the session only: release it so that the calls of a tab run in parallel | ||
| Session::writeClose(); | ||
|
|
||
| $choices = PluginDatainjectionInjectionType::getFieldsChoices([ | ||
| 'itemtype' => $itemtype, | ||
| 'primary_type' => $primary_type, | ||
| 'called_by' => $called_by, | ||
| 'mapping_or_info' => $mapping_or_info, | ||
| 'need_decode' => false, | ||
| ]); | ||
|
|
||
| // Use a list of pairs to keep the options order on client side | ||
| $fields = []; | ||
| foreach ($choices['fields'] as $key => $label) { | ||
| $fields[] = [$key, $label]; | ||
| } | ||
|
|
||
| return new JsonResponse([ | ||
| 'fields' => $fields, | ||
| 'value' => $choices['value'], | ||
| ]); | ||
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
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
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
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
Oops, something went wrong.
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.
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.
A missing or broken
mapping_or_infocurrently ends in PHP warnings; rejecting it with the other checks returns a clean 400: