diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-01-04 09:23:54 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-01-04 09:23:54 +0200 |
commit | 2b53fae16f07c3614ee9e9d54cd17f8102218fea (patch) | |
tree | f4c2066ff4ab269f78091690fd0d377f76dac083 /client/lib/utils.js | |
parent | 1683bcb3e5980d3af4a07c4bb22e534b98eff862 (diff) | |
parent | 4d8b2029d266843dc0eb376a0bf752c46e440a13 (diff) | |
download | wekan-2b53fae16f07c3614ee9e9d54cd17f8102218fea.tar.gz wekan-2b53fae16f07c3614ee9e9d54cd17f8102218fea.tar.bz2 wekan-2b53fae16f07c3614ee9e9d54cd17f8102218fea.zip |
Merge branch 'feature-rules' of https://github.com/Angtrim/wekan into Angtrim-feature-rules
Diffstat (limited to 'client/lib/utils.js')
-rw-r--r-- | client/lib/utils.js | 12 |
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) { |