Merge pull request #186 from Lisje/master

SQL syntax error in admin pages
Kunstmaan · Mar 6, 2015 · 3a0b107 · 3a0b107
2 parents 4170518 + 607d46a
commit 3a0b107
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclNativeHelper.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclNativeHelper.php
@@ -107,13 +107,13 @@ public function apply(QueryBuilder $queryBuilder, PermissionDefinition $permissi
         }
 
         $joinTableQuery = <<<SELECTQUERY
-SELECT DISTINCT o.object_identifier as id FROM {$databasePrefix}.acl_object_identities as o
-INNER JOIN {$databasePrefix}.acl_classes c ON c.id = o.class_id
-LEFT JOIN {$databasePrefix}.acl_entries e ON (
+SELECT DISTINCT o.object_identifier as id FROM {$databasePrefix}acl_object_identities as o
+INNER JOIN {$databasePrefix}acl_classes c ON c.id = o.class_id
+LEFT JOIN {$databasePrefix}acl_entries e ON (
     e.class_id = o.class_id AND (e.object_identity_id = o.id
     OR {$aclConnection->getDatabasePlatform()->getIsNullExpression('e.object_identity_id')})
 )
-LEFT JOIN {$databasePrefix}.acl_security_identities s ON (
+LEFT JOIN {$databasePrefix}acl_security_identities s ON (
 s.id = e.security_identity_id
 )
 WHERE c.class_type = {$rootEntity}

diff --git a/...e/Resources/SensioGeneratorBundle/skeleton/admintests/Features/Context/FeatureContext.php b/...e/Resources/SensioGeneratorBundle/skeleton/admintests/Features/Context/FeatureContext.php
@@ -105,7 +105,7 @@ public function getPasswordForUsername($username)
     public function iTryToLogInWith($username, $password)
     {
         return array(
-            new Step\Given("I am on \"".$this->lang."/login\""),
+            new Step\Given("I am on \"".$this->lang."/admin/login\""),
             new Step\Given("I wait 1 seconds"),
             new Step\Given("I press \"×\" if present"),
             new Step\Given("I fill in \"username\" with \"". $username . "\""),
@@ -198,15 +198,15 @@ public function iAmOnASpecificPage($pageName)
     public function getPageUrlForPageName($pageName)
     {
         $pages = array(
-            "forgot password" => $this->lang."/resetting/request",
+            "forgot password" => $this->lang."/admin/resetting/request",
             "users" => $this->lang."/admin/settings/users",
             "create new user" => $this->lang."/admin/settings/users/add",
             "groups" => $this->lang."/admin/settings/groups",
             "create new group" => $this->lang."/admin/settings/groups/add",
             "roles" => $this->lang."/admin/settings/roles",
             "create new role" => $this->lang."/admin/settings/roles/add",
             "dashboard" => $this->lang."/admin",
-            "login" => $this->lang."/login",
+            "login" => $this->lang."/admin/login",
             "media" => $this->lang."/admin/media/folder/1",
             "add new image" => $this->lang."/admin/media/create/2/file",
             "image" => $this->lang."/admin/media/folder/2",