From 182c698d2008edea78a11c3fd9dad32aa0b11e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be> Date: Thu, 25 Jan 2018 14:37:07 +0100 Subject: [PATCH] :ambulance: fix(plugins) Adapt code to new skipSnapshots var issue #5772 --- argonaut/addons/argonaut/class_argonautQueue.inc | 3 ++- audit/admin/audit/class_auditManagement.inc | 3 ++- ejbca/admin/ejbca/class_ejbcaManagement.inc | 3 ++- fusioninventory/admin/inventory/class_inventoryManagement.inc | 3 ++- systems/admin/systems/class_serverService.inc | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/argonaut/addons/argonaut/class_argonautQueue.inc b/argonaut/addons/argonaut/class_argonautQueue.inc index 372d7ac152..280ccc0ff9 100644 --- a/argonaut/addons/argonaut/class_argonautQueue.inc +++ b/argonaut/addons/argonaut/class_argonautQueue.inc @@ -29,7 +29,8 @@ class argonautQueue extends simpleManagement protected $autoActions = FALSE; protected $skipCpHandler = TRUE; - protected $skipSnapHandler = TRUE; + + public static $skipSnapshots = TRUE; var $read_only = FALSE; var $acl_base; diff --git a/audit/admin/audit/class_auditManagement.inc b/audit/admin/audit/class_auditManagement.inc index 926547c30c..4e8c547341 100644 --- a/audit/admin/audit/class_auditManagement.inc +++ b/audit/admin/audit/class_auditManagement.inc @@ -32,7 +32,8 @@ class auditManagement extends simpleManagement protected $autoActions = FALSE; protected $multiSelect = FALSE; protected $skipCpHandler = TRUE; - protected $skipSnapHandler = TRUE; + + public static $skipSnapshots = TRUE; public static function plInfo() { diff --git a/ejbca/admin/ejbca/class_ejbcaManagement.inc b/ejbca/admin/ejbca/class_ejbcaManagement.inc index 75c9fa526b..f334ffe9ac 100644 --- a/ejbca/admin/ejbca/class_ejbcaManagement.inc +++ b/ejbca/admin/ejbca/class_ejbcaManagement.inc @@ -22,10 +22,11 @@ class ejbcaManagement extends simpleManagement { protected $objectTypes = array('ejbcaCertificate'); protected $autoActions = FALSE; - protected $skipSnapHandler = TRUE; protected $autoFilterAttributes = array('dn', 'cn', 'description', 'userCertificate'); + public static $skipSnapshots = TRUE; + public static function plInfo() { return array( diff --git a/fusioninventory/admin/inventory/class_inventoryManagement.inc b/fusioninventory/admin/inventory/class_inventoryManagement.inc index 4c4db9880e..26c398283d 100644 --- a/fusioninventory/admin/inventory/class_inventoryManagement.inc +++ b/fusioninventory/admin/inventory/class_inventoryManagement.inc @@ -24,12 +24,13 @@ class inventoryManagement extends simpleManagement protected $departmentRootVisible = FALSE; protected $baseMode = FALSE; protected $skipCpHandler = TRUE; - protected $skipSnapHandler = TRUE; protected $autoActions = FALSE; protected $autoFilterAttributes = array('dn', 'cn', 'macAddress'); protected $objectTypes = array('inventory'); + public static $skipSnapshots = TRUE; + static function plInfo() { return array( diff --git a/systems/admin/systems/class_serverService.inc b/systems/admin/systems/class_serverService.inc index 89346a4f55..7bb7bb0e7d 100644 --- a/systems/admin/systems/class_serverService.inc +++ b/systems/admin/systems/class_serverService.inc @@ -39,7 +39,6 @@ class ServerService extends simpleManagement var $skipFooter = TRUE; var $skipHeader = TRUE; var $skipCpHandler = TRUE; - var $skipSnapHandler = TRUE; var $plugins = array(); var $current = ""; var $dialog = FALSE; @@ -51,6 +50,8 @@ class ServerService extends simpleManagement var $acl_category = ""; var $acl_base = ""; + public static $skipSnapshots = TRUE; + var $is_account; /* Return plugin information for acl handling */ -- GitLab