diff --git a/app/config/version.php b/app/config/version.php index 9606d9ca1b..50d302e07a 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-317', - 'hash_version' => 'v2.0-317-g2e044bf', + 'app_version' => 'v2.0-318', + 'hash_version' => 'v2.0-318-gb1d5812', ); \ No newline at end of file diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php index b1e051b872..df381bb907 100755 --- a/app/controllers/admin/CategoriesController.php +++ b/app/controllers/admin/CategoriesController.php @@ -218,7 +218,7 @@ class CategoriesController extends AdminController public function getDatatable() { // Grab all the categories - $categories = Category::orderBy('created_at', 'DESC'); + $categories = Category::with('assets'); if (Input::has('search')) { $categories = $categories->TextSearch(e(Input::get('search')));