Merge pull request #2559 from ellisonbg/session-fix

Allow session of type other than notebook.

notebook/static/tree/js/sessionlist.js

@@ -71,13 +71,18 @@ define([
         var len = data.length;
         var nb_path;
         for (var i=0; i<len; i++) {
-            nb_path = data[i].notebook.path;
-            this.sessions[nb_path] = {
-                id: data[i].id,
-                kernel: {
-                  name: data[i].kernel.name
-                }
-            };
+            // The classic notebook only knows about sessions for notebooks,
+            // but the server now knows about more general sessions for
+            // things like consoles.
+            if (data[i].type === 'notebook') {
+                nb_path = data[i].notebook.path;
+                this.sessions[nb_path] = {
+                    id: data[i].id,
+                    kernel: {
+                    name: data[i].kernel.name
+                    }
+                };
+            }
         }
         this.events.trigger('sessions_loaded.Dashboard', this.sessions);
     };