Skip to content

Commit

Permalink
Fix slack_ca_certs & query_key TypeError
Browse files Browse the repository at this point in the history
  • Loading branch information
nsano-rururu committed May 12, 2021
1 parent c598226 commit ba3757a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/components/config/ConfigCondition.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,7 @@ export default {
if (this.groupedOver === 'all') {
this.groupByValue = '';
this.queryKey = '';
this.queryKey = [];
}
},
Expand Down
19 changes: 14 additions & 5 deletions src/components/config/alert/ConfigAlert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,11 @@
</el-form-item>

<el-form-item label="CA Certs" prop="slackCaCerts">
<el-input id="slackCaCerts" v-model="slackCaCerts" :disabled="viewOnly" />
<label>path to a CA cert bundle to use to verify SSL connections.</label>
<el-switch
id="slackCaCerts"
v-model="slackCaCerts"
:disabled="viewOnly"
@change="changeSlackCaCerts" />
</el-form-item>

<el-form-item label="Timeout" prop="slackTimeout">
Expand Down Expand Up @@ -3048,9 +3051,7 @@ export default {
},
mounted() {
if (this.limitExcecution) {
this.enableLimitExcecution = true;
}
this.limitExcecution = this.$store.state.config.alert.limitExcecution;
},
methods: {
Expand Down Expand Up @@ -3275,6 +3276,14 @@ export default {
} else {
this.slackAttachKibanaDiscoverUrl = false;
}
},
changeSlackCaCerts(val) {
if (val) {
this.slackCaCerts = true;
} else {
this.slackCaCerts = false;
}
}
}
};
Expand Down

0 comments on commit ba3757a

Please sign in to comment.