From befd8d66f6963b68233e83fc2b2c359d6a7918ef Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 15:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8D=E7=A7=B0=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb | 2 +-
 app/views/forums/edit.html.erb       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index be6543be2..14c2f3a11 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -296,7 +296,7 @@ class ForumsController < ApplicationController
 
   #检查forum的名字
   def check_forum_name
-    forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false
+    forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
     render :text => forum_name_exist
   end
 
diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb
index 24130e727..ef1fbc12b 100644
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -43,13 +43,10 @@
     function check_forum_name(){
         check_pass = true;
         name = $("textarea[name='forum[name]']").val().trim();
-        if(name == '<%= @forum.name%>'){
-            return;
-        }
         if( name != ""){
             $.get(
                     '<%= check_forum_name_forums_path %>',
-                    {"forum_name":name},
+                    {"forum_name":name,"forum_id":<%= @forum.id%>},
                     function(data){
 
                         if( data == 'true'){