From 0b5862e4d4c3278b6fcea1afb71061ae30f7b713 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Tue, 9 Jan 2018 02:03:48 +0800
Subject: [PATCH] Fix invalid edit/delete paths on crud lists

---
 src/Controller/RoleController.php |  6 ------
 src/Controller/UserController.php | 13 +++++--------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/Controller/RoleController.php b/src/Controller/RoleController.php
index a994d8c0..066e88c0 100644
--- a/src/Controller/RoleController.php
+++ b/src/Controller/RoleController.php
@@ -82,12 +82,6 @@ class RoleController extends BaseController
             ->getQuery()
             ->getResult(Query::HYDRATE_ARRAY);
 
-        // response
-        return $this->json([
-            'meta' => $meta,
-            'data' => $rows
-        ]);
-
         // add crud urls
         foreach ($rows as $index => $row) {
             $rows[$index]['update_url'] = $this->generateUrl('role_update', ['id' => $row['id']]);
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index fdb6f5bb..4a3e954d 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -35,7 +35,7 @@ class UserController extends BaseController
     	$qb = $this->getDoctrine()
         	->getRepository(User::class)
         	->createQueryBuilder('q');
-        
+
         // count total records
         $total = $qb->select('COUNT(q)')
             ->getQuery()
@@ -87,12 +87,6 @@ class UserController extends BaseController
             ->getQuery()
             ->getResult(Query::HYDRATE_ARRAY);
 
-        // response
-        return $this->json([
-            'meta' => $meta,
-            'data' => $rows
-        ]);
-
         // add crud urls
         foreach ($rows as $index => $row) {
             $rows[$index]['update_url'] = $this->generateUrl('user_update', ['id' => $row['id']]);
@@ -100,7 +94,10 @@ class UserController extends BaseController
         }
 
         // response
-        return $this->json(['data' => $rows]);
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
     }
 
     public function create()