alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for no modules and added gotcha for ask module

This commit is contained in:
Harry Bomrah 2014-10-23 17:07:01 +08:00
parent 24b24ad760
commit 97e8aaea2b
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -78,6 +78,9 @@ group :test do
gem 'minitest-spec-rails' gem 'minitest-spec-rails'
end end
#ask
gem 'gotcha'
#desktop #desktop
gem 'angularjs-rails', '~> 1.2.20' gem 'angularjs-rails', '~> 1.2.20'
gem 'angular-ui-bootstrap-rails', '~> 0.11.0' gem 'angular-ui-bootstrap-rails', '~> 0.11.0'

31
app/controllers/admin/dashboards_controller.rb
View File

@ -31,10 +31,12 @@ class Admin::DashboardsController < ApplicationController
a = {} a = {}
total = 0 total = 0
args.each do |module_app| args.each do |module_app|
module_app_class = module_app.classify.constantize module_app_class = module_app.classify.constantize rescue nil
count = module_app_class.count if !module_app_class.nil?
a.merge!(module_app => count) count = module_app_class.count
total += count a.merge!(module_app => count)
total += count
end
end end
[Kaminari.paginate_array(a.sort {|a,b| b[1]<=>a[1]}).page(params[:page]).per(5), total] [Kaminari.paginate_array(a.sort {|a,b| b[1]<=>a[1]}).page(params[:page]).per(5), total]
end end
@ -42,10 +44,12 @@ class Admin::DashboardsController < ApplicationController
def get_recently_updated(args) def get_recently_updated(args)
a = {} a = {}
args.each do |module_app| args.each do |module_app|
module_app_class = module_app.classify.constantize module_app_class = module_app.classify.constantize rescue nil
objects = module_app_class.order_by([:updated_at, :desc]).limit(20) if !module_app_class.nil?
objects.each do |object| objects = module_app_class.order_by([:updated_at, :desc]).limit(20)
a.merge!(object => object.updated_at) unless (object.archived rescue nil) objects.each do |object|
a.merge!(object => object.updated_at) unless (object.archived rescue nil)
end
end end
end end
sorted_objects = a.sort {|a,b| b[1]<=>a[1]} sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
@ -56,17 +60,18 @@ class Admin::DashboardsController < ApplicationController
def get_most_visited(args) def get_most_visited(args)
a = {} a = {}
args.each do |module_app| args.each do |module_app|
module_app_class = module_app.classify.constantize module_app_class = module_app.classify.constantize rescue nil
objects = module_app_class.order_by([:view_count, :desc]).limit(20) if !module_app_class.nil?
objects.each do |object| objects = module_app_class.order_by([:view_count, :desc]).limit(20)
a.merge!(object => object.view_count) if object.view_count > 0 && (!object.archived rescue true) objects.each do |object|
a.merge!(object => object.view_count) if object.view_count > 0 && (!object.archived rescue true)
end
end end
end end
sorted_objects = a.sort {|a,b| b[1]<=>a[1]} sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
sorted_objects[0..19] sorted_objects[0..19]
Kaminari.paginate_array(sorted_objects).page(params[:page]).per(5) Kaminari.paginate_array(sorted_objects).page(params[:page]).per(5)
end end
private private
def check_backend_openness def check_backend_openness