Merge pull request #375 from eXpansionPluginPack/fix-374

Fix #374 : Permissions configured in the config file is ignored at first start
eXpansionPluginPack · Jun 9, 2018 · 6ef26ca · 6ef26ca
2 parents 4fe9bc2 + 6539900
commit 6ef26ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG-2.0.0.md b/CHANGELOG-2.0.0.md
@@ -1,12 +1,12 @@
 # 2.0.0.0
 ## Fixes
-* Fix #365 : Fixed exp not starting if can't fetch title/game mappings for expansion api's.
+
+* Fix #365 - Not starting if can't fetch title/game mappings for expansion api's.
+* Fix #374 - Permissions configured in the config file is ignored at first start.
 
 ## Features
 * Feature #369 : Automatically saving server settings.
 * Feature #370 : Automatically saving match settings
-
-## Features
 * Feature #372 : Admin Permissions's are now handled using services. This will allow in the feature to improve the permissions page & adds more flexibility.
 
 # 2.0.0.0-beta2 (2018-05-10)

diff --git a/src/eXpansion/Framework/AdminGroups/DependencyInjection/Compiler/ConfigPass.php b/src/eXpansion/Framework/AdminGroups/DependencyInjection/Compiler/ConfigPass.php
@@ -79,12 +79,12 @@ protected function createConfigs($groups, $permissions, ContainerBuilder $contai
                     $id = 'expansion.admin_groups.config.permissions.' . $groupCode . ".$permission";
                     $container->setDefinition($id, new ChildDefinition('expansion.admin_groups.config.permissions.abstract'))
                         ->setArgument('$path', "$pathPrefix/perm_$permission")
-                        ->setArgument('$defaultValue', $group['logins'])
-                        ->setArgument('$name', "expansion_admingroups.permission.$permission.label")
-                        ->setArgument('$description', "expansion_admingroups.permission.$permission.description");
+                        ->setArgument('$defaultValue', in_array($permission, $group['permissions']))
+                        ->setArgument('$name', "expansion_admin_groups.permission.$permission.label")
+                        ->setArgument('$description', "expansion_admin_groups.permission.$permission.description");
                     $configManager->addMethodCall('registerConfig', [new Reference($id), $id]);
                 }
             }
         }
     }
-}
+}