From: Simon Brandhof Date: Fri, 29 Aug 2014 14:32:39 +0000 (+0200) Subject: SONAR-5546 do not display "true" when change login is set ! X-Git-Tag: 4.5-RC1~33 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c801a912051c0c7cd742a2a826ce0c3a4d6cf07e;p=sonarqube.git SONAR-5546 do not display "true" when change login is set ! --- diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb index 0cdc4add221..e1adef9536b 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb @@ -33,7 +33,14 @@ <% action = change.action() action_message = message('quality_profiles.changelog.' + action.downcase) if action - author = change.authorName() ? change.authorName() : change.login() ? !change.login().empty? : 'System' + + if change.authorName() && !change.authorName().empty() + author = change.authorName() + elsif change.login() && !change.login().empty() + author = change.login() + else + author = 'System' + end rule = change.ruleName() ? change.ruleName() : change.ruleKey() %> <%= Internal.i18n.formatDateTime(change.time()) -%>