Merge branch 'feature-rules' of https://github.com/Angtrim/wekan into Angtrim-feature-rules

1 files changed, 11 insertions, 1 deletions

diff --git a/client/lib/utils.js b/client/lib/utils.js
index d46d8076..051ec952 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -218,10 +218,20 @@ Utils = {
       const element = tempInstance.$(triggerEls[i]);
       if (element.hasClass('trigger-text')) {
         finalString += element.text().toLowerCase();
+      } else if (element.hasClass('user-details')) {
+        let username = element.find('input').val();
+        if(username == undefined || username == ''){
+          username = '*';
+        }
+        finalString += `${element.find('.trigger-text').text().toLowerCase() } ${  username}`;
       } else if (element.find('select').length > 0) {
         finalString += element.find('select option:selected').text().toLowerCase();
       } else if (element.find('input').length > 0) {
-        finalString += element.find('input').val();
+        let inputvalue = element.find('input').val();
+        if(inputvalue == undefined || inputvalue == ''){
+          inputvalue = '*';
+        }
+        finalString += inputvalue;
       }
       // Add space
       if (i !== length - 1) {