|
145 | 145 |
|
146 | 146 | countlyPlugins.toggle(plugins, function(res) {
|
147 | 147 | if (res.result === "started") {
|
148 |
| - //self.showPluginProcessMessage(jQuery.i18n.map["plugins.processing"], jQuery.i18n.map["plugins.will-restart"], jQuery.i18n.map["plugins.please-wait"], 5000, true, 'warning', false); |
149 |
| - //self.checkProcess(); |
| 148 | + //self.showPluginProcessMessage(jQuery.i18n.map["plugins.processing"], jQuery.i18n.map["plugins.will-restart"], jQuery.i18n.map["plugins.please-wait"], 5000, true, 'warning', false); |
| 149 | + //self.checkProcess(); |
150 | 150 | self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true);
|
151 | 151 | }
|
152 | 152 | else {
|
|
327 | 327 | self.removeNonGlobalConfigs(self.configsData);
|
328 | 328 | }
|
329 | 329 | catch (error) {
|
330 |
| - // eslint-disable-next-line no-console |
| 330 | + // eslint-disable-next-line no-console |
331 | 331 | console.error(error);
|
332 | 332 | self.configsData = {};
|
333 | 333 | }
|
|
463 | 463 | this.configsData[config][key] = value;
|
464 | 464 | //when user disables country data tracking while city data tracking is enabled
|
465 | 465 | if (key === "country_data" && value === false && this.configsData[config].city_data === true) {
|
466 |
| - //disable city data tracking |
| 466 | + //disable city data tracking |
467 | 467 | this.configsData[config].city_data = false;
|
468 | 468 | //if city data tracking was originally enabled, note the change
|
469 | 469 | index = this.diff.indexOf("city_data");
|
|
479 | 479 | }
|
480 | 480 | //when user enables city data tracking while country data tracking is disabled
|
481 | 481 | if (key === "city_data" && value === true && this.configsData[config].country_data === false) {
|
482 |
| - //enable country data tracking |
| 482 | + //enable country data tracking |
483 | 483 | this.configsData[config].country_data = true;
|
484 | 484 | //if country data tracking was originally disabled, note the change
|
485 | 485 | index = this.diff.indexOf("country_data");
|
|
540 | 540 | var plugs = countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].plugins;
|
541 | 541 | //check if value can be overwritten on user level
|
542 | 542 | if (configsData[ns]._user && configsData[ns]._user[id]) {
|
543 |
| - //check if value is overwritten on user level |
| 543 | + //check if value is overwritten on user level |
544 | 544 | var sets = countlyGlobal.member.settings;
|
545 | 545 | if (sets && sets[ns] && typeof sets[ns][id] !== "undefined") {
|
546 | 546 | return {label: jQuery.i18n.map["configs.overwritten.user"], href: "#/account-settings"};
|
|
642 | 642 | let label = self.getLabelName(item, config) || "";
|
643 | 643 | let helper = self.getHelperLabel(item, config) || "";
|
644 | 644 | return label.toLowerCase().includes(self.searchQuery)
|
645 |
| - || helper.toLowerCase().includes(self.searchQuery); |
| 645 | + || helper.toLowerCase().includes(self.searchQuery); |
646 | 646 | });
|
647 | 647 | if (list.length > 0) {
|
648 | 648 | let tmp = group;
|
|
678 | 678 | },
|
679 | 679 | clearSearch: function() {
|
680 | 680 | this.searchQuery = "";
|
681 |
| - //this.searchResultStructure = {}; |
| 681 | + //this.searchResultStructure = {}; |
682 | 682 | }
|
683 | 683 | }
|
684 | 684 | });
|
|
1322 | 1322 | });
|
1323 | 1323 |
|
1324 | 1324 | if (countlyAuth.validateGlobalAdmin()) {
|
1325 |
| - app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '<div class="logo-icon fa fa-puzzle-piece"></div>', priority: 80}); |
| 1325 | + if (!countlyGlobal.mycountly && countlyGlobal.plugins.indexOf('my-countly') === -1) { |
| 1326 | + app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '<div class="logo-icon fa fa-puzzle-piece"></div>', priority: 80}); |
| 1327 | + } |
1326 | 1328 | }
|
1327 | 1329 | if (countlyAuth.validateGlobalAdmin()) {
|
1328 | 1330 | app.addMenu("management", {code: "configurations", pluginName: "plugins", url: "#/manage/configurations", text: "plugins.configs", icon: '<div class="logo-icon ion-android-options"></div>', priority: 30});
|
|
1332 | 1334 | if (!isCurrentHostnameIP && !isGlobalDomainHasValue) {
|
1333 | 1335 | countlyPlugins.updateConfigs({"api": {"domain": window.location.protocol + "//" + window.location.hostname}}, function(err) {
|
1334 | 1336 | if (err) {
|
1335 |
| - // throw err |
| 1337 | + // throw err |
1336 | 1338 | }
|
1337 | 1339 | });
|
1338 | 1340 | }
|
|
0 commit comments