Merge pull request #128 from vincent99/projects

Send user header for more things

Author: vincent99

app/activesetting/model.js

@@ -0,0 +1,13 @@
+import Cattle from 'ui/utils/cattle';
+import C from 'ui/utils/constants';
+
+var ActiveSetting = Cattle.TransitioningResource.extend({
+});
+
+ActiveSetting.reopenClass({
+  headers: {
+    [C.HEADER.PROJECT]: C.HEADER.PROJECT_USER_SCOPE, // Requests for projects use the user's scope, not the project
+  }
+});
+
+export default ActiveSetting;

app/githubconfig/model.js

@@ -0,0 +1,15 @@
+import Cattle from 'ui/utils/cattle';
+import C from 'ui/utils/constants';
+
+var GithubConfig = Cattle.TransitioningResource.extend({
+  type: 'githubConfig',
+});
+
+// Projects don't get pushed by /subscribe WS, so refresh more often
+GithubConfig.reopenClass({
+  headers: {
+    [C.HEADER.PROJECT]: C.HEADER.PROJECT_USER_SCOPE, // Requests for projects use the user's scope, not the project
+  }
+});
+
+export default GithubConfig;

app/setting/model.js

@@ -6,7 +6,7 @@ var Setting = Cattle.TransitioningResource.extend({
 
 Setting.reopenClass({
   headers: {
-    [C.HEADER.PROJECT]: undefined, // Don't send project ID header for any requests to that type
+    [C.HEADER.PROJECT]: C.HEADER.PROJECT_USER_SCOPE, // Requests for projects use the user's scope, not the project
   }
 });
 

app/settings/auth/route.js

@@ -1,9 +1,14 @@
 import AuthenticatedRouteMixin from 'ui/mixins/authenticated-route';
 import Ember from 'ember';
+import C from 'ui/utils/constants';
 
 export default Ember.Route.extend(AuthenticatedRouteMixin,{
   model: function() {
-    return this.get('store').find('githubconfig', null, {forceReload: true}).then(function(collection) {
+
+    var headers = {};
+    headers[C.HEADER.PROJECT] = C.HEADER.PROJECT_USER_SCOPE;
+
+    return this.get('store').find('githubconfig', null, {headers: headers, forceReload: true}).then(function(collection) {
       return collection.get('firstObject');
     });
   },