diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-10-30 14:51:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 14:51:11 +0100 |
commit | a1506a8e8f3f55ee17677ce8b0612ba10e8ccd17 (patch) | |
tree | dc63fb844a3a9094995f2c49fb039a60e1e6af3f | |
parent | Merge pull request #160 from GustavoKatel/notificationTitleFix (diff) | |
parent | fix(Service Import): Fix issue with import of on-premise services (diff) | |
download | ferdium-app-a1506a8e8f3f55ee17677ce8b0612ba10e8ccd17.tar.gz ferdium-app-a1506a8e8f3f55ee17677ce8b0612ba10e8ccd17.tar.zst ferdium-app-a1506a8e8f3f55ee17677ce8b0612ba10e8ccd17.zip |
Merge pull request #176 from meetfranz/feature/fix-hosted-service-import
fix(Service Import): Fix issue with import of on-premise services
-rw-r--r-- | src/stores/ServicesStore.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 2ddeeffd4..1d895d532 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -145,12 +145,12 @@ export default class ServicesStore extends Store { | |||
145 | serviceData.name = data.name; | 145 | serviceData.name = data.name; |
146 | } | 146 | } |
147 | 147 | ||
148 | if (data.team) { | 148 | if (data.team && !data.customURL) { |
149 | serviceData.team = data.team; | 149 | serviceData.team = data.team; |
150 | } | 150 | } |
151 | 151 | ||
152 | if (data.team) { | 152 | if (data.team && data.customURL) { |
153 | serviceData.customUrl = data.customURL; | 153 | serviceData.customUrl = data.team; |
154 | } | 154 | } |
155 | 155 | ||
156 | this.actions.service.createService({ | 156 | this.actions.service.createService({ |
@@ -158,8 +158,6 @@ export default class ServicesStore extends Store { | |||
158 | serviceData, | 158 | serviceData, |
159 | redirect: false, | 159 | redirect: false, |
160 | }); | 160 | }); |
161 | |||
162 | return 'hello world'; | ||
163 | } | 161 | } |
164 | 162 | ||
165 | @action async _updateService({ serviceId, serviceData, redirect = true }) { | 163 | @action async _updateService({ serviceId, serviceData, redirect = true }) { |