Recent viewed are available at initial load.

d--j · Aug 26, 2014 · 87c9115 · 87c9115
1 parent 202f052
commit 87c9115
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/controllers/recent_viewed_controller.rb b/app/controllers/recent_viewed_controller.rb
@@ -19,7 +19,7 @@ class RecentViewedController < ApplicationController
 =end
 
   def index
-    recent_viewed = RecentView.list_fulldata( current_user, 10 )
+    recent_viewed = RecentView.list_full( current_user, 10 )
 
     # return result
     render :json => recent_viewed

diff --git a/app/controllers/sessions/collection_base.rb b/app/controllers/sessions/collection_base.rb
@@ -13,6 +13,9 @@ def session( collections, assets, user )
     collections[ OnlineNotification.to_app_model ] = OnlineNotification.list(user, 20)
     assets = ApplicationModel.assets_of_object_list(collections[ OnlineNotification.to_app_model ], assets)
 
+    collections[ RecentView.to_app_model ] = RecentView.list(user, 10)
+    assets = RecentView.assets_of_object_list(collections[ RecentView.to_app_model ], assets)
+
     collections[ Role.to_app_model ] = []
     Role.all.each {|item|
       assets = item.assets(assets)

diff --git a/app/models/recent_view.rb b/app/models/recent_view.rb
@@ -46,20 +46,20 @@ def self.list( user, limit = 10 )
     list
   end
 
-  def self.list_fulldata( user, limit = 10 )
+  def self.list_full( user, limit = 10 )
     recent_viewed = self.list( user, limit )
 
     # get related object
     assets = ApplicationModel.assets_of_object_list(recent_viewed)
 
     return {
-      :recent_viewed => recent_viewed,
-      :assets        => assets,
+      :stream => recent_viewed,
+      :assets => assets,
     }
   end
 
   def notify_clients
-    data = RecentView.list_fulldata( User.find(self.created_by_id), 10 )
+    data = RecentView.list_full( User.find(self.created_by_id), 10 )
     Sessions.send_to(
       self.created_by_id,
       {