Merge branch 'instance/fid' into instance/fid_adlr

module/finc/config/module.config.php

@@ -117,6 +117,10 @@ $config = [
                 ],
             ],
             'hierarchy_treedataformatter' => [
+                'factories' => [
+                    'finc\Hierarchy\TreeDataFormatter\NoCollections' =>
+                        'Zend\ServiceManager\Factory\InvokableFactory',
+                ],
                 'aliases' => [
                     'json' => 'finc\Hierarchy\TreeDataFormatter\NoCollections',
                 ],
@@ -236,7 +240,8 @@ $config = [
             'aliases' => [
                 'CatUserType' => 'finc\Role\PermissionProvider\CatUserType',
                 'IpRangeFoFor' => 'finc\Role\PermissionProvider\IpRangeFoFor',
-                'IpRegExFoFor' => 'finc\Role\PermissionProvider\IpRegExFoFor'
+                'IpRegExFoFor' => 'finc\Role\PermissionProvider\IpRegExFoFor',
+                'IpRange' => 'VuFind\Role\PermissionProvider\IpRange',
             ]
         ]
     ],