summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/lib/httpresponse.js2
-rw-r--r--webapp/src/components/LogModule.vue16
2 files changed, 17 insertions, 1 deletions
diff --git a/server/lib/httpresponse.js b/server/lib/httpresponse.js
index 8b6c452..cb4b216 100644
--- a/server/lib/httpresponse.js
+++ b/server/lib/httpresponse.js
@@ -11,7 +11,7 @@ class HttpResponse {
if (this.httpStatus >= 400) response.error = this.idString
else if (this.idString) response.action = this.idString
if (this.message) response.message = this.message
- res.status(this.httpStatus).send({ ...response, ...this.data })
+ res.status(this.httpStatus).send({ ...this.data, ...response })
}
}
diff --git a/webapp/src/components/LogModule.vue b/webapp/src/components/LogModule.vue
index 6f580cb..a381fb2 100644
--- a/webapp/src/components/LogModule.vue
+++ b/webapp/src/components/LogModule.vue
@@ -189,6 +189,14 @@
<v-subheader>{{ $t('log') }}</v-subheader>
<v-card>
<data-table :loading="loading" :headers="headers" :items="log" min-width="900px" no-select no-sort :row-count="-1">
+ <template #category="{ item }">
+ <span
+ style="user-select: text"
+ :class="item.category.indexOf('ERROR_') === 0 ? 'error--text' : item.category.indexOf('WARNING_') === 0 ? 'warning--text' : 'primary--text'"
+ >
+ {{ item.category }}
+ </span>
+ </template>
<template #description="{ item }">
<log-module-entry :item="item"></log-module-entry>
</template>
@@ -356,4 +364,12 @@ export default {
min-width: 70px;
width: 70px;
}
+
+.theme--dark .primary--text {
+ color: white !important;
+}
+
+.error--text, .warning--text {
+ font-weight: bold;
+}
</style>