Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

2016-11-14 16:37:54 +08:00 · 2016-11-14 16:37:54 +08:00 · 5605a9e638
parent edf8ceed7c ddb747bfcb
commit 5605a9e638
1 changed files with 1 additions and 1 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -324,7 +324,7 @@ class User < Principal
  # id 转换成 登录名
  # 如果是整数就去ID，否则就取login
  def to_param
-    self.login.to_i.to_s == self.login ? id : login
+    (self.login.to_i.to_s == self.login || self.login.include?(".") || self.login.include?("%") || self.login.include?("?")) ? id : login
  end