-。-

acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面

app/controllers/account_controller.rb

@@ -111,8 +111,7 @@ class AccountController < ApplicationController
       user_params = params[:user] || {}
       @user = User.new
       @user.safe_attributes = user_params
-      #这里判断 
+      if params[:identity] == "2" #   2 企业
-      if params[:identity] == "2"
         @user.firstname = params[:enterprise_name]
         @user.lastname = l(:field_enterprise)
       end
@@ -132,16 +131,6 @@ class AccountController < ApplicationController
         @user.login = params[:user][:login]
         unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
           @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
-          # system "htpasswd -mb "+@root_path+"user.passwd "+params[:user][:login]+" "+user_params[:password]
-          # system "echo -e '\n"+params[:user][:login]+"-write:"+
-                 # " "+params[:user][:login]+"'  >> "+@root_path+"group.passwd"
-          # system "mkdir "+@root_path+"htdocs/"+params[:user][:login]
-# 
-          # system "echo -e 'Allow from all \n Order Deny,Allow \n "+
-                 # "<Limit PUT POST DELETE PROPPATCH MKCOL COPY MOVE LOCK UNLOCK> \n"+
-                 # "Require group "+params[:user][:login]+"-write  \n "+
-                 # "</Limit> \n ' >>"+
-                 # @root_path+"htdocs/"+params[:user][:login]+"/.htaccess"
         end
 
         case Setting.self_registration

app/controllers/school_controller.rb

@@ -41,9 +41,22 @@ class SchoolController < ApplicationController
     @provinces.each do |p|
       options << "<option value = '#{p.province}' >#{p.province}</option>"
     end
-
+    @school = School.all
-    render :text => options
+    
     
+    options_s = ""
+    
+    @school.each do |s|
+      #options << "<option value=#{s.id}>#{s.name}</option>"
+      options_s << "<li style = 'width: 33%; float: left'><a id=#{s.id} onclick='test(this.id, this.text)'>#{s.name}</a></li>"
+    end
+    res = Hash.new
+    res[:text] = options
+    res[:text_s] = options_s
+
+    render :json => res
+
+
   end
   
   def get_options
@@ -74,8 +87,11 @@ class SchoolController < ApplicationController
   end
   
   def search_school
-    @school = School.where("province = ? AND name LIKE '%"+params[:key_word]+"%'", params[:province]);
+    if params[:province].nil? or params[:province] == "0"
-    
+      @school = School.where("name LIKE '%"+params[:key_word]+"%'");
+    else  
+      @school = School.where("province = ? AND name LIKE '%"+params[:key_word]+"%'", params[:province]);
+    end
     options = ""
     @school.each do |s|
       options << "<li style = 'width: 33%; float: left'><a id=#{s.id} onclick='test(this.id)'>#{s.name}</a></li>"

app/controllers/users_controller.rb

@@ -38,6 +38,7 @@ class UsersController < ApplicationController
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, 
                                   :watch_bids, :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index, 
                                   :activity_score_index, :influence_score_index, :score_index]
+  before_filter :auth_user_extension, only: :show
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
   
   #william
@@ -735,4 +736,11 @@ class UsersController < ApplicationController
   def setting_layout(default_base='base_users')
     User.current.admin? ? 'base_admin' : default_base 
   end
+
+  def auth_user_extension
+    if @user.user_extensions.school.nil?
+      flash[:error] = l(:error_complete_occupation)
+      redirect_to my_account_path
+    end
+  end
 end

app/views/school/index.html.erb

@@ -4,12 +4,17 @@
 	$(document).ready(function() {
 		$("#province").html("<option value='0' selected = true style='display: none;'></option>");
 
+
+
+
 		$.ajax({
 			type :"POST",
 			url :'/school/get_province',
- 			data :'text',
+			data: "send",
-			success: function(data){
+			success: function(data, textStatus){
-				$("#province").append(data);
+				
+				 $("#province").append(data.text);
+				 $("#schoollist").html(data.text_s);
 			}
 		})
 

app/views/users/_mail_notifications.html.erb

@@ -1,5 +1,5 @@
 <p>
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %>
+<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" %>
 <%= select_tag(
       'user[mail_notification]',
       options_for_select(

app/views/users/show.html.erb

@@ -244,7 +244,7 @@
 	</div>
 
 	<div class="pagination" style="float:left;">
-		<ul> <%= pagination_links_full @info_pages %> <ul>
+		<ul> <%= pagination_links_full @info_pages %> </ul>
 	</div>
 
 	<% else %>

config/locales/zh.yml

@@ -185,6 +185,8 @@ zh:
   notice_unable_delete_time_entry: 无法删除工时
   notice_issue_done_ratios_updated: 问题完成度已更新。
   notice_gantt_chart_truncated: "这个表是截断的因为它超过了可以显示的最大数量(%{max})"
+  
+  error_complete_occupation: "请您填写工作单位，否则本系统的部分功能将无法正常使用。"
 
   error_can_t_load_default_data: "无法载入默认设置：%{value}"
   error_scm_not_found: "版本库中不存在该条目和（或）其修订版本。"