update settings for telemetry

This commit is contained in:
Westly Wright 2018-03-30 17:05:21 -07:00
parent f6f7b7ba4a
commit 120c0494c0
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
3 changed files with 23 additions and 9 deletions

View File

@ -7,11 +7,22 @@ export default Route.extend({
settings: service(), settings: service(),
globalStore: service(), globalStore: service(),
model: function() { beforeModel() {
this._super(...arguments);
return this.get('settings').load([
C.SETTING.TELEMETRY,
]);
},
model() {
// let settings = this.get('settings');
let globalStore = get(this, 'globalStore'); let globalStore = get(this, 'globalStore');
return globalStore.find('setting', C.SETTING.SERVER_URL).then((serverUrl) => { return globalStore.find('setting').then((settings) => {
let serverUrl = settings.findBy('id', C.SETTING.SERVER_URL);
// debugger;
return { return {
telemetry: settings.findBy('id', C.SETTING.TELEMETRY),
serverUrl: get(serverUrl, 'value') || window.location.host, serverUrl: get(serverUrl, 'value') || window.location.host,
serverUrlSetting: serverUrl, serverUrlSetting: serverUrl,
}; };

View File

@ -1,14 +1,16 @@
{{settings/settings-header}} {{settings/settings-header}}
{{!-- {{!--
{{#if settings.isRancher}}
{{#if settings.isRancher}}
<section class="box mb-20"> <section class="box mb-20">
{{settings/telemetry-opt initialValue=model.telemetry}} {{settings/telemetry-opt
initialValue=model.telemetry.value
}}
</section> </section>
<hr/> <hr/>
{{/if}} {{/if}}
--}} --}}
{{!-- {{!--
{{settings/danger-zone}} --}} {{settings/danger-zone}} --}}

View File

@ -26,6 +26,7 @@ export default Component.extend({
init() { init() {
this._super(...arguments); this._super(...arguments);
debugger;
let val = false; let val = false;
if ( this.get('initialValue') === IN ) { if ( this.get('initialValue') === IN ) {
val = true; val = true;