From 803e9cbdb51e93c1028376320e70cc046ce9c28e Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Thu, 10 Jul 2014 16:21:55 +0800
Subject: [PATCH] =?UTF-8?q?globel=20issue#858,=20=E4=B8=AD=E5=9B=BD?=
 =?UTF-8?q?=E9=AB=98=E6=A0=A1--=E8=BE=93=E5=85=A5=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=82=B9=E5=87=BB=E6=90=9C=E7=B4=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/school_controller.rb | 15 ++++++++-------
 config/locales/en.yml                |  1 +
 config/locales/zh.yml                |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index 3fb42b64d..8b3692449 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -99,16 +99,17 @@ class SchoolController < ApplicationController
   
   def search_school
     q = "%#{params[:key_word].strip}%"
-    if params[:province].nil? or params[:province] == "0"
-      @school = School.where("name LIKE ?", q);
-    else  
-      @school = School.where("province = ? AND name LIKE ?", params[:province], q);
-    end
+    
+    @school = School.where("name LIKE ?", q)
+    @school = @school.where("province = ?", params[:province]) if (params[:province] != '0' )
+
     options = ""
     @school.each do |s|
       options << "<li style = 'width: 33%; float: left'> <a id=#{s.id} onclick='test(this.id)'>#{s.name}</a></li>"
     end
-     
-     render :text => options    
+
+    options = "<div class='flash error' id='flash_error'>#{l(:label_school_not_fount)}</div>" if options.blank?
+
+    render :text => options    
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c177b58e..a23bbfadb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1469,6 +1469,7 @@ en:
   label_teacher: Teacher
   label_student: Student
   label_school_all: Schools
+  label_school_not_fount: Not found by your input query condition.
   label_other: Other
   label_gender: Gender
   label_gender_male: male
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1b3774d65..2fe9f754e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1857,6 +1857,7 @@ zh:
   
   #added by Wen
   label_school_all: 中国高校
+  label_school_not_fount: 没有符合的高校信息
   
   
   label_project_grade: 项目得分