webui: improve JobLog message formatting

Signed-off-by: Alvaro Flaño <tikoflano@gmail.com>
bareos · Jun 11, 2020 · d188c6b · d188c6b
1 parent d6a6033
commit d188c6b
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/webui/public/js/bootstrap-table-formatter.js b/webui/public/js/bootstrap-table-formatter.js
@@ -490,18 +490,11 @@ function formatFilesetName(value, row, index, basePath) {
 function formatLogMessage(value) {
    var msg = (value).replace(/\n/g, "<br />");
 
-   if(msg.search("Error") > 0) {
-      return msg.replace(/Error/g, '<span class="bg-danger text-danger">Error</span>');
-   }
-   else if(msg.search("error") > 0) {
-      return msg.replace(/error/g, '<span class="bg-danger text-danger">error</span>');
-   }
-   else if(msg.search("Warning") > 0) {
-      return msg.replace(/Warning/g, '<span class="bg-warning text-warning">Warning</span>');
-   }
-   else {
-      return msg;
-   }
+   msg = msg.replace(/(e)rror(s?)/gi, '<span class="bg-danger text-danger">$1rror$2</span>');
+   msg = msg.replace(/(w)arning(s?)/gi, '<span class="bg-warning text-warning">$1arning$2</span>');
+   msg = msg.replace(/jobid=([0-9]*)/gi, '<a class="bg-info text-info" href="' +  basePath + '/job/details/$1">JobId=$1</a>');
+
+   return msg;
 }
 
 function formatAutochangerStatus(value) {