Browse Source

base url improvements

pull/3646/head
YevhenBondarenko 6 years ago
committed by Andrew Shvayka
parent
commit
b9cc400a15
  1. 1
      application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
  2. 3
      ui/src/app/admin/general-settings.tpl.html
  3. 3
      ui/src/app/locale/locale.constant-en_US.json

1
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java

@ -116,6 +116,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
generalSettings.setKey("general");
ObjectNode node = objectMapper.createObjectNode();
node.put("baseUrl", "http://localhost:8080");
node.put("prohibitDifferentUrl", true);
generalSettings.setJsonValue(node);
adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, generalSettings);

3
ui/src/app/admin/general-settings.tpl.html

@ -39,6 +39,9 @@
ng-model="vm.settings.jsonValue.prohibitDifferentUrl">
{{ 'admin.prohibit-different-url' | translate }}
</md-checkbox>
<div translate class="tb-hint">
admin.prohibit-different-url-hint
</div>
<div layout="row" layout-align="end center" width="100%" layout-wrap>
<md-button ng-disabled="$root.loading || vm.settingsForm.$invalid || !vm.settingsForm.$dirty" type="submit" class="md-raised md-primary">{{'action.save' | translate}}</md-button>
</div>

3
ui/src/app/locale/locale.constant-en_US.json

@ -74,7 +74,8 @@
"test-mail-sent": "Test mail was successfully sent!",
"base-url": "Base URL",
"base-url-required": "Base URL is required.",
"prohibit-different-url": "Prohibit different URL",
"prohibit-different-url": "Prohibit to use hostname from the client request headers",
"prohibit-different-url-hint": "This setting should be enabled for production environments. May cause security issues when disabled",
"mail-from": "Mail From",
"mail-from-required": "Mail From is required.",
"smtp-protocol": "SMTP protocol",

Loading…
Cancel
Save