Skip to content

Fix/service catalog update schema mismatch #211

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

Closed
Mary-Clb wants to merge 2 commits into from
Closed

Fix/service catalog update schema mismatch #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b27652
prevent service catalog crash
Mary-Clb May 5, 2026
4a0ce94
update CHANGELOG.md
Mary-Clb May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed

- Prevent a crash on the service catalog page when plugin files are updated before the database schema migration is applied.

## [1.14.0] - 2026-04-30

### Added
Expand Down
12 changes: 12 additions & 0 deletions inc/alert.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,21 @@ public static function displayOnTicket()

public static function displayOnServiceCatalog()
{
if (!self::hasServiceCatalogDisplayFlag()) {
return;
}

self::displayAlerts(['show_only_service_catalog_alerts' => true]);
}

private static function hasServiceCatalogDisplayFlag(): bool
{
/** @var DBmysql $DB */
global $DB;

return $DB->fieldExists(self::getTable(), 'is_displayed_onservicecatalog');
}

public static function displayAlerts($params = [])
{
/** @var array $CFG_GLPI */
Expand Down
11 changes: 7 additions & 4 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ function plugin_init_news()
/**
* @var array $PLUGIN_HOOKS
* @var array $CFG_GLPI
* @var DBmysql $DB
*/
global $PLUGIN_HOOKS, $CFG_GLPI;
global $PLUGIN_HOOKS, $CFG_GLPI, $DB;

$PLUGIN_HOOKS['csrf_compliant']['news'] = true;

Expand All @@ -62,9 +63,11 @@ function plugin_init_news()
$PLUGIN_HOOKS['display_central']['news'] = [
'PluginNewsAlert', 'displayOnCentral',
];
$PLUGIN_HOOKS['display_service_catalog']['news'] = [
'PluginNewsAlert', 'displayOnServiceCatalog',
];
if ($DB->fieldExists(PluginNewsAlert::getTable(), 'is_displayed_onservicecatalog')) {
$PLUGIN_HOOKS['display_service_catalog']['news'] = [
'PluginNewsAlert', 'displayOnServiceCatalog',
];
}
$PLUGIN_HOOKS['pre_item_list']['news'] = ['PluginNewsAlert', 'preItemList'];

$PLUGIN_HOOKS['pre_item_form']['news'] = ['PluginNewsAlert', 'preItemForm'];
Expand Down