bug fixes

app/authenticated/cluster/projects/new/route.js

@@ -19,7 +19,7 @@ export default Route.extend({
     return hash({
       project,
       projects: store.findAll('project'),
-      roles: store.findAll('projectRoleTemplate'),
+      roles: store.findAll('roleTemplate'),
     });
   },
 });

lib/shared/addon/mixins/subscribe.js

@@ -8,18 +8,21 @@ import C from 'ui/utils/constants';
 import Queue from 'ui/utils/queue';
 
 export default Mixin.create({
-  intl            : service(),
-  growl           : service(),
-  k8s             : service(),
-  scope        : service(),
+  intl:              service(),
+  growl:             service(),
+  k8s:               service(),
+  scope:             service(),
+  store:             service(),
+  globalStore:       service(),
+  clusterStore:      service(),
 
-  subscribeSocket : null,
-  reconnect: true,
-  connected: false,
-  queue: null,
-  queueTimer: null,
-  warningShown: false,
-  wasConnected: false,
+  subscribeSocket :  null,
+  reconnect:         true,
+  connected:         false,
+  queue:             null,
+  queueTimer:        null,
+  warningShown:      false,
+  wasConnected:      false,
   disconnectedTimer: null,
 
   init() {

lib/shared/addon/scope/service.js

@@ -204,7 +204,7 @@ export default Service.extend({
           }
           else
           {
-            return fail();
+            return this.selectDefaultCluster();
           }
         });
       });
@@ -212,11 +212,12 @@ export default Service.extend({
 
 
     function select(project, overwriteDefault) {
-      if (project.get('clusterId')) {
-        self.set('currentCluster', self.get('globalStore').getById('cluster', project.get('clusterId'))||{});
-      }
       if ( project )
       {
+        if (project.get('clusterId')) {
+          self.set('currentCluster', self.get('globalStore').getById('cluster', project.get('clusterId'))||{});
+        }
+
         cookies.set(C.COOKIE.PROJECT, project.get('id'));
 
         // If there is no default project, set it
@@ -230,7 +231,7 @@ export default Service.extend({
       }
       else
       {
-        this.get('cookies').remove(C.COOKIE.PROJECT);
+        self.get('cookies').remove(C.COOKIE.PROJECT);
         return self.setCurrent(null);
       }
     }