From d34ab220cca37904e9759771163130f890d5465e Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 1 Jul 2014 17:12:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2ae3083d8..6138f9b56 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -577,15 +577,16 @@ class User < Principal
   # Find a user account by matching the exact login and then a case-insensitive
   # version.  Exact matches will be given priority.
   #通过用户名查找相应的用户，若没有匹配到，则不区分大小写进行查询
+  #修改：不再匹配不区分大小写情况 -zjc
   def self.find_by_login(login)
     if login.present?
       login = login.to_s
       # First look for an exact match
       user = where(:login => login).all.detect {|u| u.login == login}
-      unless user
-        # Fail over to case-insensitive if none was found
-        user = where("LOWER(login) = ?", login.downcase).first
-      end
+      #unless user
+      #  # Fail over to case-insensitive if none was found
+      #  user = where("LOWER(login) = ?", login.downcase).first
+      #end
       user
     end
   end

From cc2862ae0f73d33e26e94e4824d45fbae0604fbf Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 1 Jul 2014 17:21:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=B8=A9=E8=87=AA=E5=B7=B1=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/praise_tread/_praise_tread.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb
index 2b859cf76..e0ad6fd9b 100644
--- a/app/views/praise_tread/_praise_tread.html.erb
+++ b/app/views/praise_tread/_praise_tread.html.erb
@@ -101,7 +101,7 @@
                       <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
                     </tr>
                     <tr>
-                      <td><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_not_tread_over) %> </td>
+                      <td><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_not_treed_over) %> </td>
                     </tr>
                   </table>
               <% else %>

From 830e2d4fb49a8ab4d96dcdab2cc02779624e8d07 Mon Sep 17 00:00:00 2001
From: xianbo <xianbo@nudt.com>
Date: Tue, 1 Jul 2014 18:18:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=20=E7=AB=99=E9=95=BF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index c62a974d0..ec7516689 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -29,7 +29,7 @@
 </div>
 </div>
 </div>
-<div class="debug">
+<div class="debug hidden">
   <%= debug(params) if Rails.env.development? %>
 
   <script src="http://s4.cnzz.com/z_stat.php?id=1000482288&web_id=1000482288" language="JavaScript"></script>

From e1d9d6ab45dabfe78c7997b22ba4d8802736812d Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Tue, 1 Jul 2014 16:01:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?tag=E6=9F=A5=E8=AF=A2=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb               | 16 ++++++++--------
 ...140701075839_add_tag_type_index_to_tagging.rb |  5 +++++
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20140701075839_add_tag_type_index_to_tagging.rb

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 4c0d91884..0216d529d 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -256,14 +256,14 @@ class TagsController < ApplicationController
   
   # 获取有某类对象的tag总数
   def get_tags_size
-    @issues_tags_num = Issue.tag_counts.size
-    @projects_tags_num = Project.tag_counts.size
-    @users_tags_num = User.tag_counts.size
-    @bids_tags_num = Bid.tag_counts.size
-    forum_tags_num = Forum.tag_counts.size
-    attachment_tags_num = Attachment.tag_counts.size
-    @open_source_projects_num = OpenSourceProject.tag_counts.size
-    @contests_tags_num = Contest.tag_counts.size
+    @issues_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Issue").count
+    @projects_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Project").count
+    @users_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"User").count
+    @bids_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Bid").count
+    forum_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Forum").count
+    attachment_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Attachment").count
+    @open_source_projects_num =  ActsAsTaggableOn::Tagging.where(taggable_type:"OpenSourceProject").count
+    @contests_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Contest").count
     return @users_tags_num,@projects_tags_num,@issues_tags_num,@bids_tags_num, forum_tags_num, attachment_tags_num, @contests_tags_num, @open_source_projects_num
   end
   
diff --git a/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb b/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
new file mode 100644
index 000000000..11a5b4ef9
--- /dev/null
+++ b/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
@@ -0,0 +1,5 @@
+class AddTagTypeIndexToTagging < ActiveRecord::Migration
+  def change
+  	add_index :taggings, :taggable_type
+  end
+end