diff options
author | 2018-12-09 22:08:27 +0100 | |
---|---|---|
committer | 2018-12-09 22:08:27 +0100 | |
commit | 09bc9eecfe922b8fa1bf929517231ecdf181fef7 (patch) | |
tree | ededb7b0b7c317a9853c4ed87827b246dc313dd1 /src/containers | |
parent | Fix linting issues (diff) | |
download | ferdium-app-09bc9eecfe922b8fa1bf929517231ecdf181fef7.tar.gz ferdium-app-09bc9eecfe922b8fa1bf929517231ecdf181fef7.tar.zst ferdium-app-09bc9eecfe922b8fa1bf929517231ecdf181fef7.zip |
Add port option to service proxy config
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 9 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index f0b7268d6..b46908344 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -71,6 +71,10 @@ const messages = defineMessages({ | |||
71 | id: 'settings.service.form.proxy.host', | 71 | id: 'settings.service.form.proxy.host', |
72 | defaultMessage: '!!!Proxy Host/IP', | 72 | defaultMessage: '!!!Proxy Host/IP', |
73 | }, | 73 | }, |
74 | proxyPort: { | ||
75 | id: 'settings.service.form.proxy.port', | ||
76 | defaultMessage: '!!!Port', | ||
77 | }, | ||
74 | proxyUser: { | 78 | proxyUser: { |
75 | id: 'settings.service.form.proxy.user', | 79 | id: 'settings.service.form.proxy.user', |
76 | defaultMessage: '!!!User', | 80 | defaultMessage: '!!!User', |
@@ -233,6 +237,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
233 | value: serviceProxyConfig.host, | 237 | value: serviceProxyConfig.host, |
234 | default: '', | 238 | default: '', |
235 | }, | 239 | }, |
240 | port: { | ||
241 | label: intl.formatMessage(messages.proxyPort), | ||
242 | value: serviceProxyConfig.port, | ||
243 | default: '', | ||
244 | }, | ||
236 | user: { | 245 | user: { |
237 | label: intl.formatMessage(messages.proxyUser), | 246 | label: intl.formatMessage(messages.proxyUser), |
238 | value: serviceProxyConfig.user, | 247 | value: serviceProxyConfig.user, |
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index adad8a9bd..3d35effc5 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -147,7 +147,6 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten | |||
147 | // user={user.data} | 147 | // user={user.data} |
148 | status={user.actionStatus} | 148 | status={user.actionStatus} |
149 | form={form} | 149 | form={form} |
150 | isEnterprise={user.data.isEnterprise} | ||
151 | isSaving={user.updateUserInfoRequest.isExecuting} | 150 | isSaving={user.updateUserInfoRequest.isExecuting} |
152 | onSubmit={d => this.onSubmit(d)} | 151 | onSubmit={d => this.onSubmit(d)} |
153 | /> | 152 | /> |