yona-projects / yona star
doortts doortts 2017-08-11
user: Remove verbose name expression in mention
@0296a9dc6e7eb81e7436186d956a8a4407fdbe79
1899347
0296a9d
app/models/User.java
--- app/models/User.java
+++ app/models/User.java
@@ -991,4 +991,16 @@
 
     public boolean isLocked() {
 
         return this.state == UserState.LOCKED || this.state == UserState.DELETED;
 
     }
 
+
 
+    public String getPureNameOnly(){
 
+        String pureName = this.name;
 
+        String [] spliters = { "[", "(" };
 
+        for(String spliter: spliters) {
 
+            if(pureName.contains(spliter)){
 
+                pureName = this.name.substring(0, this.name.indexOf(spliter));
 
+            }
 
+        }
 
+
 
+        return pureName;
 
+    }
 
 }
1899347
0296a9d
app/utils/AutoLinkRenderer.java
--- app/utils/AutoLinkRenderer.java
+++ app/utils/AutoLinkRenderer.java
@@ -328,9 +328,9 @@
 
             if( user.avatarUrl().equals(UserApp.DEFAULT_AVATAR_URL) ){
 
                 avatarImage = "";
 
             } else {
 
-                avatarImage = "<img src='" + user.avatarUrl() + "' class='avatar-wrap smaller no-margin-no-padding vertical-top' alt='@" + user.loginId + "'> ";
 
+                avatarImage = "<img src='" + user.avatarUrl() + "' class='avatar-wrap smaller no-margin-no-padding vertical-top' alt='@" + user.name + " " + user.loginId + "'> ";
 
             }
 
-            return new Link(RouteUtil.getUrl(user), "no-text-decoration", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.loginId) + "\">@" + user.name + "</span>");
 
+            return new Link(RouteUtil.getUrl(user), "no-text-decoration", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.name + " " + user.loginId) + "\">@" + user.getPureNameOnly() + "</span>");
 
         }
 
     }
Add a comment
List