Changes on nccu
This commit is contained in:
1 parent
2c16284f73
commit
6a022c90da
15 files changed
+89
-22
No files matched your search
@@ -30,7 +30,7 @@ class Admin::DashboardsController < ApplicationController
|
||||
module_app_class = module_app.classify.constantize
|
||||
objects = module_app_class.order_by(:updated_at, :desc).limit(10)
|
||||
objects.each do |object|
|
||||
a.merge!(object => object.updated_at)
|
||||
a.merge!(object => object.updated_at) unless (object.archived rescue nil)
|
||||
end
|
||||
end
|
||||
sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
|
||||
@@ -43,7 +43,7 @@ class Admin::DashboardsController < ApplicationController
|
||||
module_app_class = module_app.classify.constantize
|
||||
objects = module_app_class.order_by(:view_count, :desc).limit(10)
|
||||
objects.each do |object|
|
||||
a.merge!(object => object.view_count) if object.view_count > 0
|
||||
a.merge!(object => object.view_count) if object.view_count > 0 && (!object.archived rescue true)
|
||||
end
|
||||
end
|
||||
sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
|
||||
|
||||
@@ -39,7 +39,7 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
|
||||
def update_setting_by_params
|
||||
user_sat = []
|
||||
ma = ModuleApp.find params[:module_app][:id]
|
||||
user_sat = User.find params[:users].keys if params.has_key? :users
|
||||
user_sat += User.find params[:users].keys if params.has_key?('users')
|
||||
users_to_new = user_sat - ma.managing_users
|
||||
users_to_remove = ma.managing_users - user_sat
|
||||
|
||||
|
||||
Reference in new issue
Block a user