Skip to content

Commit ecba9af

Browse files
authored
Merge pull request #1912 from pnrgenc/domain-in-settings
SERVER-2283: Set api.domain in settings automatically.
2 parents 1a1f703 + e027da2 commit ecba9af

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

plugins/plugins/frontend/app.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
var exportedPlugin = {};
1+
var exportedPlugin = {},
2+
plugins = require('../../pluginManager.js');
23

34
(function(plugin) {
4-
plugin.init = function() {
5+
plugin.init = function() {};
56

7+
plugin.renderDashboard = function(ob) {
8+
ob.data.countlyGlobal.domain = plugins.getConfig("api").domain;
69
};
710
}(exportedPlugin));
811

plugins/plugins/frontend/public/javascripts/countly.views.js

+10
Original file line numberDiff line numberDiff line change
@@ -1731,5 +1731,15 @@ $(document).ready(function() {
17311731
app.addMenu("management", {code: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '<div class="logo-icon fa fa-puzzle-piece"></div>', priority: 30});
17321732
}
17331733
app.addMenu("management", {code: "configurations", url: "#/manage/configurations", text: "plugins.configs", icon: '<div class="logo-icon ion-android-options"></div>', priority: 40});
1734+
1735+
var isCurrentHostnameIP = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(window.location.hostname);
1736+
var isGlobalDomainHasValue = countlyGlobal.domain === "" || typeof countlyGlobal.domain === "undefined" ? false : true;
1737+
if (!isCurrentHostnameIP && !isGlobalDomainHasValue) {
1738+
countlyPlugins.updateConfigs({"api": {"domain": window.location.hostname}}, function(err) {
1739+
if (err) {
1740+
// throw err
1741+
}
1742+
});
1743+
}
17341744
}
17351745
});

0 commit comments

Comments
 (0)