From 7f876a8008476f6fef5d6fa090e0963e6374c27d Mon Sep 17 00:00:00 2001 From: Leena Date: Fri, 5 Feb 2016 17:42:20 +0530 Subject: [PATCH] Add the scope to rescue block to avoid the DB migration conflict with active admin --- app/admin/app_usage.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/admin/app_usage.rb b/app/admin/app_usage.rb index 338aab5..52ceecf 100644 --- a/app/admin/app_usage.rb +++ b/app/admin/app_usage.rb @@ -1,16 +1,20 @@ ActiveAdmin.register_page "App Usage" do menu priority: 2, label: "App Usage" - app_usages = AppUsage.select(:package_name,:device_id,:used_on). + app_usage_data = [] + begin + app_usages = AppUsage.select(:package_name,:device_id,:used_on). order("used_on desc"). group("device_id","package_name","used_on"). sum("usage_duration_in_seconds") - app_usage_data = [] - app_usages.each do |key,value| - app_usage_data << {device_id: key[0], + app_usages.each do |key,value| + app_usage_data << {device_id: key[0], package_name: key[1], used_on: key[2], usage: value} + end + rescue + end content title: "App Usage" do