Merge pull request #623 from LearningLocker/issue/active-users

Fixes active users.

Author: ryasmi

app/views/partials/lrs/backbone/templates.blade.php

@@ -96,7 +96,7 @@
   <%= _id.mbox != null ? '<b>Email:</b> ' + _id.mbox : '' %>
   <%= _id.mbox_sha1sum != null ? '<b>Email:</b> ' + _id.mbox_sha1sum : '' %>
   <%= _id.openid != null ? '<b>OpenID:</b> ' + _id.openid : '' %>
-  <%= _id.account != null ? '<b>Account:</b> ' + _id.account.homePage + _id.account.name : '' %>
+  <%= _id.account != null ? '<b>Account:</b> ' + _id.account.homePage + '/' + _id.account.name : '' %>
 </script>
 
 <script id="userList" type="text/template">

public/assets/js/lrs/collections/UserCollection.js

@@ -10,6 +10,9 @@ define([
     url: function(){
       return '../lrs/' + App.lrs_id + '/stats/activeUsers';
     },
+    generateId: function (attrs) {
+      return JSON.stringify(attrs._id);
+    }
   });
 
   return UserCollection;

public/assets/js/lrs/models/stats/UserModel.js

@@ -4,13 +4,7 @@ define([
   'app'
 ], function(_, Backbone, App) {
 
-  var UserModel = Backbone.Model.extend({
-    //urlRoot: '../lrs/' + App.lrs_id + '/stats/activeUsers',
-    urlRoot: function(){
-      return window.LL.siteroot + '/lrs/' + App.lrs_id + '/stats/activeUsers';
-    },
-    idAttribute: "_id"
-  });
+  var UserModel = Backbone.Model.extend({});
 
   return UserModel;
 

public/assets/js/lrs/views/actor/UserList.js

@@ -16,7 +16,7 @@ define([
     itemView: UserListView,
 
     appendHtml: function(collectionView, itemView){
-        collectionView.$("#active").append(itemView.el);
+      collectionView.$("#active").append(itemView.el);
     }
 
   });