diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 769214d6..d3d42685 100644 --- a/app/controllers/account_controller.rb +++ b/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" + if params[:identity] == "2" # 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 "+ - # " \n"+ - # "Require group "+params[:user][:login]+"-write \n "+ - # " \n ' >>"+ - # @root_path+"htdocs/"+params[:user][:login]+"/.htaccess" end case Setting.self_registration diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb index 5b405a27..00faa51c 100644 --- a/app/controllers/school_controller.rb +++ b/app/controllers/school_controller.rb @@ -41,9 +41,22 @@ class SchoolController < ApplicationController @provinces.each do |p| options << "" end - - render :text => options + @school = School.all + + options_s = "" + + @school.each do |s| + #options << "" + options_s << "
  • #{s.name}
    • " + 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 << "
  • #{s.name}
    • " diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d4248e3c..f6855505 100644 --- a/app/controllers/users_controller.rb +++ b/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 diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 58f68400..7158037e 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -1,604 +1,556 @@ - - - - - - -
    - <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %> - <%= call_hook(:view_my_account_contextual, :user => @user)%> +
    + <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %> + <%= call_hook(:view_my_account_contextual, :user => @user) %>
    -

    <%= l(:label_my_account)%>

    +

    <%= l(:label_my_account) %>

    - - <%= labelled_form_for :user, @user, - :url => { :action => "account" }, - :html => { :id => 'my_account_form', - :method => :post } do |f| %> -
    - <% end %> - - <% @user.custom_field_values.select(&:editable?).each do |value| %> -

    - <%= custom_field_tag_with_label :user, value %> -

    - <% end %> - <%= call_hook(:view_my_account, :user => @user, :form => f) %> - - - --> - - - <%= submit_tag l(:button_save) %> - + <% end %> <% html_title(l(:label_my_account)) -%> + + \ No newline at end of file diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb index 06b294f8..755bd315 100644 --- a/app/views/school/index.html.erb +++ b/app/views/school/index.html.erb @@ -4,12 +4,17 @@ $(document).ready(function() { $("#province").html(""); + + + $.ajax({ type :"POST", url :'/school/get_province', - data :'text', - success: function(data){ - $("#province").append(data); + data: "send", + success: function(data, textStatus){ + + $("#province").append(data.text); + $("#schoollist").html(data.text_s); } }) diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb index ee6ccb00..47face83 100644 --- a/app/views/users/_mail_notifications.html.erb +++ b/app/views/users/_mail_notifications.html.erb @@ -1,5 +1,5 @@

    -<%= 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( diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index dd912cfe..8168060e 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -244,7 +244,7 @@

    <% else %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 26d3f668..b8378c0d 100644 --- a/config/locales/zh.yml +++ b/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: "版本库中不存在该条目和（或）其修订版本。"