app/controllers/caboose/sites_controller.rb in caboose-cms-0.9.34 vs app/controllers/caboose/sites_controller.rb in caboose-cms-0.9.35

- old
+ new

@@ -35,17 +35,17 @@ h = { 'name' => '', 'description' => '', 'name_like' => '', 'description_like' => '', - } + } pager = Caboose::Pager.new(params, h, { - 'model' => 'Caboose::Site', - 'sort' => 'name', - 'desc' => 'false', - 'base_url' => "/admin/sites", + 'model' => 'Caboose::Site', + 'sort' => 'name', + 'desc' => 'false', + 'base_url' => "/admin/sites", 'items_per_page' => 1000 - }) + }) render :json => { :pager => pager, :models => pager.items.as_json(:include => :domains) } end