Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/school_controller.rb

@@ -5,14 +5,18 @@ class SchoolController < ApplicationController
   def upload
     uploaded_io = params[:logo]
     school_id ||= params[:id]
+    s1 = School.find(school_id)
     unless uploaded_io.nil? 
       File.open(Rails.root.join('public', 'images', 'school', school_id.to_s+'.png'), 'wb') do |file|
         file.write(uploaded_io.read)
       end
-      s1 = School.find(school_id)
+
       s1.logo_link  = '/images/school/'+school_id.to_s+'.png'
-      s1.save
+
     end
+    s1.name = params[:name] unless params[:name].blank?
+    s1.province = params[:province] unless params[:province].blank?
+    s1.save
     redirect_to admin_schools_url(:school_name => params[:school_name])
   end