From 2c8f94c89950c9b0f922874d4cb9522407b3530a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 26 Jul 2016 09:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89ID=E8=BD=AC=E6=8D=A2=E6=88=90?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 7 -------
 app/models/user.rb                | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 58622a089..d64d95223 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -33,13 +33,6 @@ module ApplicationHelper
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
-  def user_path(resource, parameters = {})
-    if Fixnum ===  resource
-      resource = User.find(resource)
-    end
-    super
-  end
-
   # def user_blogs_path(resource,parameters={})
   #   super
   # end
diff --git a/app/models/user.rb b/app/models/user.rb
index 7e592248e..996aa9be7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -311,11 +311,6 @@ class User < Principal
     )
   end
 
-  # id 转换成 登录名
-  def to_param
-    Fixnum === self.login ? id : login
-  end
-
   # ======================================================================
   def my_workplace
     self.user_extensions.try(:occupation).to_s