-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
show approvals in read-only mode when Object Lock is enabled #23477
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
f2cmb
wants to merge
3
commits into
glpi-project:11.0/bugfixes
Choose a base branch
from
f2cmb:11.0/23455
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
3 commits
Select commit
Hold shift + click to select a range
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
138 changes: 138 additions & 0 deletions
138
install/migrations/update_11.0.5_to_11.0.6/validation_read_right.php
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,138 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * --------------------------------------------------------------------- | ||
| * | ||
| * GLPI - Gestionnaire Libre de Parc Informatique | ||
| * | ||
| * http://glpi-project.org | ||
| * | ||
| * @copyright 2015-2026 Teclib' and contributors. | ||
| * @licence https://www.gnu.org/licenses/gpl-3.0.html | ||
| * | ||
| * --------------------------------------------------------------------- | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This file is part of GLPI. | ||
| * | ||
| * This program 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 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program 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 this program. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * --------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| use Glpi\DBAL\QueryExpression; | ||
|
|
||
| /** | ||
| * --------------------------------------------------------------------- | ||
| * | ||
| * GLPI - Gestionnaire Libre de Parc Informatique | ||
| * | ||
| * http://glpi-project.org | ||
| * | ||
| * @copyright 2015-2026 Teclib' and contributors. | ||
| * @licence https://www.gnu.org/licenses/gpl-3.0.html | ||
| * | ||
| * --------------------------------------------------------------------- | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This file is part of GLPI. | ||
| * | ||
| * This program 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 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program 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 this program. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * --------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| /** @var DBmysql $DB */ | ||
| global $DB; | ||
|
|
||
| // Add READ right to profiles that already have any ticketvalidation or changevalidation rights. | ||
| // Previously, the READ right was explicitly removed from CommonITILValidation::getRights(), | ||
| // making it impossible to view validations in read-only contexts (e.g. Object Lock mode). | ||
| foreach (['ticketvalidation', 'changevalidation'] as $right_name) { | ||
| $DB->update( | ||
| 'glpi_profilerights', | ||
| [ | ||
| 'rights' => new QueryExpression( | ||
| $DB->quoteName('rights') . ' | ' . READ | ||
| ), | ||
| ], | ||
| [ | ||
| 'name' => $right_name, | ||
| ['NOT' => ['rights' => 0]], | ||
| ] | ||
| ); | ||
| } | ||
|
|
||
| // Ensure the Object Lock profile also has READ for validation rights, | ||
| // so validations remain visible when a ticket/change is viewed in read-only lock mode. | ||
| // This is needed separately from the above query because the lock profile may have | ||
| // rights = 0 (excluded by the NOT condition above) or may not have an entry at all. | ||
| $lock_profile_row = $DB->request([ | ||
| 'SELECT' => 'value', | ||
| 'FROM' => 'glpi_configs', | ||
| 'WHERE' => [ | ||
| 'name' => 'lock_lockprofile_id', | ||
| 'context' => 'core', | ||
| ], | ||
| ])->current(); | ||
|
|
||
| $lock_profile_id = (int) ($lock_profile_row['value'] ?? 0); | ||
| if ($lock_profile_id > 0) { | ||
| foreach (['ticketvalidation', 'changevalidation'] as $right_name) { | ||
| $existing = $DB->request([ | ||
| 'FROM' => 'glpi_profilerights', | ||
| 'WHERE' => [ | ||
| 'profiles_id' => $lock_profile_id, | ||
| 'name' => $right_name, | ||
| ], | ||
| ]); | ||
|
|
||
| if (count($existing) > 0) { | ||
| $DB->update( | ||
| 'glpi_profilerights', | ||
| [ | ||
| 'rights' => new QueryExpression( | ||
| $DB->quoteName('rights') . ' | ' . READ | ||
| ), | ||
| ], | ||
| [ | ||
| 'profiles_id' => $lock_profile_id, | ||
| 'name' => $right_name, | ||
| ] | ||
| ); | ||
| } else { | ||
| $DB->insert( | ||
| 'glpi_profilerights', | ||
| [ | ||
| 'profiles_id' => $lock_profile_id, | ||
| 'name' => $right_name, | ||
| 'rights' => READ, | ||
| ] | ||
| ); | ||
| } | ||
| } | ||
| } | ||
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.
Usually, we do not change existing "configuration" on update. There is no reliable way to know if it's not been changed, or set on purpose.