diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2018-12-10 16:34:53 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-12 13:34:46 +0100 |
| commit | c32090618e535eb48fb4dc377659ff97dae1a9ee (patch) | |
| tree | a3c22c2ba5d16ff4a1b9246b053ce3fdafe5a148 /src/stores | |
| parent | Merge branch 'develop' into chore/lerna (diff) | |
| download | ferdium-app-c32090618e535eb48fb4dc377659ff97dae1a9ee.tar.gz ferdium-app-c32090618e535eb48fb4dc377659ff97dae1a9ee.tar.zst ferdium-app-c32090618e535eb48fb4dc377659ff97dae1a9ee.zip | |
merge default and fetched feature configs
Diffstat (limited to 'src/stores')
| -rw-r--r-- | src/stores/FeaturesStore.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index 0adee6adf..eb2b21af3 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
| @@ -37,7 +37,7 @@ export default class FeaturesStore extends Store { | |||
| 37 | 37 | ||
| 38 | @computed get features() { | 38 | @computed get features() { |
| 39 | if (this.stores.user.isLoggedIn) { | 39 | if (this.stores.user.isLoggedIn) { |
| 40 | return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; | 40 | return Object.assign({}, DEFAULT_FEATURES_CONFIG, this.featuresRequest.execute().result); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | return DEFAULT_FEATURES_CONFIG; | 43 | return DEFAULT_FEATURES_CONFIG; |