diff options
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/FeaturesStore.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index 0adee6adf..05a620f0b 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -7,6 +7,7 @@ import delayApp from '../features/delayApp'; | |||
7 | import spellchecker from '../features/spellchecker'; | 7 | import spellchecker from '../features/spellchecker'; |
8 | import serviceProxy from '../features/serviceProxy'; | 8 | import serviceProxy from '../features/serviceProxy'; |
9 | import basicAuth from '../features/basicAuth'; | 9 | import basicAuth from '../features/basicAuth'; |
10 | import workspaces from '../features/workspaces'; | ||
10 | 11 | ||
11 | import { DEFAULT_FEATURES_CONFIG } from '../config'; | 12 | import { DEFAULT_FEATURES_CONFIG } from '../config'; |
12 | 13 | ||
@@ -37,7 +38,7 @@ export default class FeaturesStore extends Store { | |||
37 | 38 | ||
38 | @computed get features() { | 39 | @computed get features() { |
39 | if (this.stores.user.isLoggedIn) { | 40 | if (this.stores.user.isLoggedIn) { |
40 | return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; | 41 | return Object.assign({}, DEFAULT_FEATURES_CONFIG, this.featuresRequest.execute().result); |
41 | } | 42 | } |
42 | 43 | ||
43 | return DEFAULT_FEATURES_CONFIG; | 44 | return DEFAULT_FEATURES_CONFIG; |
@@ -56,5 +57,6 @@ export default class FeaturesStore extends Store { | |||
56 | spellchecker(this.stores, this.actions); | 57 | spellchecker(this.stores, this.actions); |
57 | serviceProxy(this.stores, this.actions); | 58 | serviceProxy(this.stores, this.actions); |
58 | basicAuth(this.stores, this.actions); | 59 | basicAuth(this.stores, this.actions); |
60 | workspaces(this.stores, this.actions); | ||
59 | } | 61 | } |
60 | } | 62 | } |