diff options
author | Simon Rettberg | 2019-11-05 18:01:37 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-11-05 18:01:37 +0100 |
commit | 50d28a0ad8dcf5d9fe697278b6ea05aa00f8fb87 (patch) | |
tree | 0418c774e8cbda6376f2f8a699af6e67a9055235 /modules-available/statistics/baseconfig | |
parent | [permissionmanager] Fix creating bogus negative cache entries (diff) | |
download | slx-admin-50d28a0ad8dcf5d9fe697278b6ea05aa00f8fb87.tar.gz slx-admin-50d28a0ad8dcf5d9fe697278b6ea05aa00f8fb87.tar.xz slx-admin-50d28a0ad8dcf5d9fe697278b6ea05aa00f8fb87.zip |
[baseconfig] Overhaul hook system
This enables us to finally properly show the inheritance flow
of all the config variables when editing the baseconfig for
a certain location or machine.
Diffstat (limited to 'modules-available/statistics/baseconfig')
-rw-r--r-- | modules-available/statistics/baseconfig/getconfig.inc.php | 3 | ||||
-rw-r--r-- | modules-available/statistics/baseconfig/hook.json | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules-available/statistics/baseconfig/getconfig.inc.php b/modules-available/statistics/baseconfig/getconfig.inc.php index ea351d15..053827db 100644 --- a/modules-available/statistics/baseconfig/getconfig.inc.php +++ b/modules-available/statistics/baseconfig/getconfig.inc.php @@ -8,6 +8,9 @@ if (Request::any('force', 0, 'int') === 1 && Request::any('module', false, 'stri } } +if (!$uuid) // Required at this point, bail out if not given + return; + // Query machine specific settings $res = Database::simpleQuery("SELECT setting, value FROM setting_machine WHERE machineuuid = :uuid", ['uuid' => $uuid]); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { diff --git a/modules-available/statistics/baseconfig/hook.json b/modules-available/statistics/baseconfig/hook.json index da28ad5d..4a406653 100644 --- a/modules-available/statistics/baseconfig/hook.json +++ b/modules-available/statistics/baseconfig/hook.json @@ -3,5 +3,5 @@ "field": "machineuuid", "locationResolver": "StatisticsHooks::baseconfigLocationResolver", "tostring": "StatisticsHooks::getBaseconfigName", - "getfallback": "StatisticsHooks::getBaseconfigParent" + "getInheritance": "StatisticsHooks::baseconfigInheritance" }
\ No newline at end of file |