Skip to content

Commit 1f4d9bb

Browse files
committed
Don't blow up on add host for project
1 parent 19f2759 commit 1f4d9bb

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

app/pods/hosts/new/route.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ import Ember from 'ember';
33

44
export default Ember.Route.extend({
55
model: function() {
6+
var store = this.get('store');
67
var userType = this.get('session').get(C.USER_TYPE_SESSION_KEY);
78
var isAdmin = userType === undefined || userType === C.USER_TYPE_ADMIN;
8-
if ( isAdmin )
9+
if ( isAdmin && store.hasRecordFor('schema','setting') )
910
{
10-
return this.get('store').find('setting', C.SETTING_API_HOST).then((setting) => {
11+
return store.find('setting', C.SETTING_API_HOST).then((setting) => {
1112
if ( setting.get('value') )
1213
{
1314
return Ember.RSVP.resolve();

app/pods/setting/model.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import Cattle from 'ui/utils/cattle';
2+
import C from 'ui/utils/constants';
3+
4+
var Setting = Cattle.TransitioningResource.extend({
5+
});
6+
7+
Setting.reopenClass({
8+
headers: {
9+
[C.PROJECT_HEADER]: undefined, // Don't send project ID header for any requests to that type
10+
}
11+
});
12+
13+
export default Setting;

0 commit comments

Comments
 (0)