more sort, fix typo

This commit is contained in:
wh1te909
2020-10-26 06:15:59 +00:00
parent 7b742c310d
commit ff322cbc0c
5 changed files with 10 additions and 24 deletions

View File

@@ -558,7 +558,7 @@ export default {
const text = agent.maintenance_mode ? "Maintenance mode was disabled" : "Maintenance mode was enabled";
this.$store
.dispatch("toggleMaintenaceMode", data)
.dispatch("toggleMaintenanceMode", data)
.then(response => {
this.$q.notify(notifySuccessConfig(text));
this.$emit("refreshEdit");
@@ -568,7 +568,7 @@ export default {
});
},
menuMaintenanceText(mode) {
return mode ? "Disable Maintenace Mode" : "Enable Maintenace Mode";
return mode ? "Disable Maintenance Mode" : "Enable Maintenance Mode";
},
},
computed: {

View File

@@ -89,7 +89,7 @@ export default {
opt["value"] = i.pk;
options.push(opt);
}
return options;
return options.sort((a, b) => a.label.localeCompare(b.label));
},
},
created() {

View File

@@ -46,29 +46,15 @@
</div>
<q-card-section>
<q-radio dark v-model="loglevel" color="cyan" val="info" label="Info" @input="getLog" />
<q-radio
dark
v-model="loglevel"
color="red"
val="critical"
label="Critical"
@input="getLog"
/>
<q-radio dark v-model="loglevel" color="red" val="critical" label="Critical" @input="getLog" />
<q-radio dark v-model="loglevel" color="red" val="error" label="Error" @input="getLog" />
<q-radio
dark
v-model="loglevel"
color="yellow"
val="warning"
label="Warning"
@input="getLog"
/>
<q-radio dark v-model="loglevel" color="yellow" val="warning" label="Warning" @input="getLog" />
</q-card-section>
<q-separator />
<q-card-section>
<q-scroll-area
:thumb-style="{ right: '4px', borderRadius: '5px', background: 'red', width: '10px', opacity: 1 }"
style="height: 60vh;"
style="height: 60vh"
>
<pre>{{ logContent }}</pre>
</q-scroll-area>
@@ -109,7 +95,7 @@ export default {
getLog() {
axios.get(`/logs/debuglog/${this.loglevel}/${this.agent}/${this.order}/`).then(r => {
this.logContent = r.data.log;
this.agents = r.data.agents.map(k => k.hostname);
this.agents = r.data.agents.map(k => k.hostname).sort();
this.agents.unshift("all");
});
},

View File

@@ -147,7 +147,7 @@ export default function () {
}
},
actions: {
toggleMaintenaceMode(context, data) {
toggleMaintenanceMode(context, data) {
return axios.post("/agents/maintenance/", data)
},
getAgentCounts(context, data = {}) {

View File

@@ -490,7 +490,7 @@ export default {
const text = node.color === "warning" ? "Maintenance mode was disabled" : "Maintenance mode was enabled";
this.$store
.dispatch("toggleMaintenaceMode", data)
.dispatch("toggleMaintenanceMode", data)
.then(response => {
this.$q.notify(notifySuccessConfig(text));
this.getTree();
@@ -500,7 +500,7 @@ export default {
});
},
menuMaintenanceText(node) {
return node.color === "warning" ? "Disable Maintenace Mode" : "Enable Maintenace Mode";
return node.color === "warning" ? "Disable Maintenance Mode" : "Enable Maintenance Mode";
},
},
computed: {