Skip to content

Fix incorrect declaration during order deletion #580

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

Merged
stonebuzz merged 3 commits into from
May 27, 2026
Merged

Fix incorrect declaration during order deletion #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
180dc37
Fix incorrect declaration during order deletion
stonebuzz May 18, 2026
052238d
fix CS
stonebuzz May 18, 2026
58ab32a
Merge branch 'main' into fix_declaration
stonebuzz May 27, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Prevent invalid references and non-existent classes during generate item flow.
- Remove unnecessary message during plugin installation
- Update locales
- Fix getDatabaseRelations() declarations to fix warnings on order deletion
- Fix `glpi_plugin_order_referencefrees` table not removed on uninstall


Expand Down
45 changes: 30 additions & 15 deletions hook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,38 +151,53 @@ function plugin_order_getDropdown()
}


/* define dropdown relations */
function plugin_order_getDatabaseRelations()
{
$plugin = new Plugin();
if ($plugin->isActivated("order")) {
// Ensure all plugin classes are declared so that getItemTypeForTable() resolves
// them with the correct case on the first call (before they are in the cache).
foreach (glob(PLUGIN_ORDER_DIR . '/inc/*.php') as $file) {
if (preg_match('/injection.class.php/', $file) === 0) {
include_once($file);
}
}

return [
"glpi_plugin_order_orders" => [
"glpi_plugin_order_orderpayments" => "plugin_order_orders_id",
"glpi_plugin_order_ordertaxes" => "plugin_order_orders_id",
"glpi_plugin_order_ordertypes" => "plugin_order_orders_id",
"glpi_plugin_order_orderstates" => "plugin_order_orders_id",
"glpi_plugin_order_orders_items" => "plugin_order_orders_id",
"glpi_plugin_order_orders_suppliers" => "plugin_order_orders_id",
"glpi_plugin_order_orderpayments" => [
"glpi_plugin_order_orders" => "plugin_order_orderpayments_id",
],
"glpi_plugin_order_ordertaxes" => [
"glpi_plugin_order_orders" => "plugin_order_ordertaxes_id",
],
"glpi_plugin_order_ordertypes" => [
"glpi_plugin_order_orders" => "plugin_order_ordertypes_id",
],
"glpi_plugin_order_orderstates" => [
"glpi_plugin_order_orders" => "plugin_order_orderstates_id",
],
"glpi_plugin_order_accountsections" => [
"glpi_plugin_order_orders" => "plugin_order_accountsections_id",
"glpi_plugin_order_accountsections" => "plugin_order_accountsections_id",
],
"glpi_plugin_order_analyticnatures" => [
"glpi_plugin_order_orders_items" => "plugin_order_analyticnatures_id",
],
"glpi_plugin_order_deliverystates" => [
"glpi_plugin_order_orders_items" => "plugin_order_deliverystates_id",
],
"glpi_plugin_order_orders" => [
"glpi_plugin_order_orders_items" => "plugin_order_orders_id",
"glpi_plugin_order_orders_suppliers" => "plugin_order_orders_id",
],
"glpi_plugin_order_references" => [
"glpi_plugin_order_orders_items" => "plugin_order_references_id",
"glpi_plugin_order_orders_items" => "plugin_order_references_id",
"glpi_plugin_order_references_suppliers" => "plugin_order_references_id",
],
"glpi_entities" => [
"glpi_plugin_order_orders" => "entities_id",
"glpi_plugin_order_orders" => "entities_id",
"glpi_plugin_order_references" => "entities_id",
"glpi_plugin_order_others" => "entities_id",
"glpi_plugin_order_bills" => "entities_id",
"glpi_plugin_order_others" => "entities_id",
"glpi_plugin_order_bills" => "entities_id",
],
"glpi_budgets" => [
"glpi_plugin_order_orders" => "budgets_id",
Expand All @@ -191,8 +206,8 @@ function plugin_order_getDatabaseRelations()
"glpi_plugin_order_others" => "plugin_order_othertypes_id",
],
"glpi_suppliers" => [
"glpi_plugin_order_orders" => "suppliers_id",
"glpi_plugin_order_orders_suppliers" => "suppliers_id",
"glpi_plugin_order_orders" => "suppliers_id",
"glpi_plugin_order_orders_suppliers" => "suppliers_id",
"glpi_plugin_order_references_suppliers" => "suppliers_id",
],
"glpi_manufacturers" => [
Expand Down