From 5f969c6593011ba1aafe4b15ef0682ac9d930288 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 3 Aug 2016 10:36:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AE=A1=E6=A0=B8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb            | 18 +++++-------------
 app/views/admin/_all_schools.html.erb          |  2 ++
 app/views/admin/all_schools.js.erb             | 16 ++++++++--------
 app/views/admin/applied_schools.html.erb       |  4 ++--
 app/views/admin/has_applied_schools.html.erb   |  4 ++--
 app/views/my/account.html.erb                  | 10 +++++-----
 app/views/users/_user_message_applied.html.erb | 12 ++++++------
 public/javascripts/application.js              |  2 ++
 8 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index c98116806..2e51d6a03 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -674,9 +674,7 @@ class AdminController < ApplicationController
       aas.update_attribute(:status, 2)
       AppliedMessage.create(:user_id => aas.user_id, :status => 2, :viewed => true, :applied_id => aas.id, :applied_type => "ApplyAddSchools", :name => school[0].name )
       users = UserExtensions.where("school_id = #{aas.school_id}")
-      users.each do |user|
-        user.update_column("school_id", school[0].id)
-      end
+      users.update_all(:school_id => school[0].id)
       if aas.school_id != school[0].id.to_i
         aas.school.destroy
       end
@@ -717,20 +715,14 @@ class AdminController < ApplicationController
     applied_school.update_attribute(:status, 3)
     # 未审批删除
     if params[:tip] == "unapplied"
-    AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => true, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
-    # 删除学校的用户
-    users = UserExtensions.where("school_id = #{applied_school.school_id}")
-    users.each do |user|
-      user.update_column("school_id", nil)
-    end
+      AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => true, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
+      # 删除学校的用户
+      users = UserExtensions.where("school_id = #{applied_school.school_id}")
+      users.update_all(:school_id => nil)
       applied_school.school.destroy
       redirect_to unapplied_schools_url
     # 已审批删除
     elsif params[:tip] == "applied"
-      users = UserExtensions.where("school_id = #{applied_school.school_id}")
-      users.each do |user|
-        user.update_column("school_id", nil)
-      end
       applied_school.destroy
       redirect_to applied_schools_url
     end
diff --git a/app/views/admin/_all_schools.html.erb b/app/views/admin/_all_schools.html.erb
index d4cf916f5..ce5bc6dc7 100644
--- a/app/views/admin/_all_schools.html.erb
+++ b/app/views/admin/_all_schools.html.erb
@@ -8,7 +8,9 @@
     <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入名称搜索" class="mt10 mb10 course-search" />
   </div>
   <div id="schools_list">
+    <% if !@search.nil? %>
     <%= render :partial => "admin/update_school_form", :locals => {:schools => schools, :edit_id => edit_id} %>
+    <% end %>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/admin/all_schools.js.erb b/app/views/admin/all_schools.js.erb
index 7a53a25dc..cbaf14ab9 100644
--- a/app/views/admin/all_schools.js.erb
+++ b/app/views/admin/all_schools.js.erb
@@ -1,11 +1,11 @@
 <% if params[:search].nil? %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'admin/all_schools', :locals => {:schools => @schools, :edit_id => @edit_id}) %>');
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'admin/all_schools', :locals => {:schools => @schools, :edit_id => @edit_id}) %>');
+    showModal('ajax-modal', '452px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+    $('#ajax-modal').parent().css("top","50%").css("left","50%");
+    $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+    $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 <% else %>
-$("#schools_list").html("<%= escape_javascript(render :partial => 'admin/update_school_form', :locals => {:schools => @schools, :edit_id => @edit_id}) %>");
+    $("#schools_list").html("<%= escape_javascript(render :partial => 'admin/update_school_form', :locals => {:schools => @schools, :edit_id => @edit_id}) %>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/applied_schools.html.erb b/app/views/admin/applied_schools.html.erb
index 19700c2c6..d37c2e09b 100644
--- a/app/views/admin/applied_schools.html.erb
+++ b/app/views/admin/applied_schools.html.erb
@@ -11,7 +11,7 @@
       </label>
       <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '输入单位名称进行搜索' %>
       <%= submit_tag l(:button_apply ), :class => "small", :name => nil %>
-      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'applied_shcools'}, :class => 'icon icon-reload' %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'applied_schools'}, :class => 'icon icon-reload' %>
     </fieldset>
 <% end %>
 &nbsp;
@@ -132,7 +132,7 @@
                   <td>
 
                   </td>
-                  <td style="text-align: left;" colspan="6">
+                  <td style="text-align: left;" colspan="7">
                     <%=  apply.remarks %>
                   </td>
                 </tr>
diff --git a/app/views/admin/has_applied_schools.html.erb b/app/views/admin/has_applied_schools.html.erb
index 535e2fe3f..f544ec8a0 100644
--- a/app/views/admin/has_applied_schools.html.erb
+++ b/app/views/admin/has_applied_schools.html.erb
@@ -11,7 +11,7 @@
       </label>
       <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '输入单位名称进行搜索' %>
       <%= submit_tag l(:button_apply ), :class => "small", :name => nil %>
-      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'applied_shcools'}, :class => 'icon icon-reload' %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'has_applied_schools'}, :class => 'icon icon-reload' %>
     </fieldset>
 <% end %>
 &nbsp;
@@ -20,7 +20,7 @@
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
     <tr>
-      <th style="width: 20px;">
+      <th style="width: 25px;">
         序号
       </th>
       <th style="width: 80px;">
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 46e8e015a..5c8e13e3f 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -80,7 +80,7 @@
                 <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
@@ -88,7 +88,7 @@
                 <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
@@ -96,7 +96,7 @@
                 <input nhname="tag" autocomplete="off" maxlength="36"   nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" placeholder="     --请选择您所属的单位--" />
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                 <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
@@ -104,7 +104,7 @@
                 <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" value="<%= User.current.user_extensions.school %>" />
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" type="text"  style="display: none;" class="w210" value="<%= User.current.user_extensions.school.id %>"/>
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                 <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text"  style="display: none;width:117px;" value="<%#= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>-->
@@ -466,7 +466,7 @@
                   }else{
                       $("#search_school_result_list").html('');
                       str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('您输入的名称尚不存在，<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
+                      $("#hint").html('如果找不到自己的单位，您可以<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">添加单位</a>');
                       $("#hint").show();
                       $("#errortip").show();
                   }
diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
index dbe01c4b4..494489a95 100644
--- a/app/views/users/_user_message_applied.html.erb
+++ b/app/views/users/_user_message_applied.html.erb
@@ -15,23 +15,23 @@
           <li class="homepageNewsPubType fl">
           <% if ma.status == 1 %>
                 <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的单位：</span>
                 <li class="homepageNewsContent fl">
-                  <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.name %>的申请，已通过">“<%= ma.name %>”的申请，已通过</a>
+                  <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.name %>的申请，已通过审核。谢谢！">“<%= ma.name %>”的申请，已通过审核。谢谢！</a>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
           <% elsif ma.status == 2 %>
                 <span class="newsBlue homepageNewsPublisher">系统提示</span>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的单位：</span>
                 <li class="homepageNewsContent fl">
-                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="“<%= ma.applied.name %>”的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”">“<%= ma.applied.name %>”的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”</a>
+                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="“<%= ma.applied.name %>”的申请，因名称不符合规范，系统已将其更改为“<%= ma.name %>”。谢谢！">“<%= ma.applied.name %>”的申请，因名称不符合规范，系统已将其更改为“<%= ma.name %>”。谢谢！</a>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
           <% elsif ma.status == 3 %>
                 <span class="newsBlue homepageNewsPublisher">系统提示</span>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的单位：</span>
                 <li class="homepageNewsContent fl">
-                  <%= link_to "“"+ma.name+"”" + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料",  { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", :target => '_blank'%>
+                  <%= link_to "“"+ma.name+"”" + "的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！",  { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
            <% elsif ma.status == 0 %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9841a20a7..efaa25475 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1910,6 +1910,7 @@ function edit_school_name(url,id){
         url,
         {id: id ,name: $("#school_name_edit_"+id).val() },
         function (data) {
+            $("#school_name_edit_"+id).val("");
             if(data.status == 0){
                 $("#apply_title_"+data.id).show();
                 $("#school_name_edit_"+data.id).hide();
@@ -1943,6 +1944,7 @@ function edit_school_address(url,id){
         url,
         {id: id ,address: $("#school_address_edit_"+id).val() },
         function (data) {
+            $("#school_address_edit_"+data.id).val("");
             if(data.status == 0){
                 $("#apply_address_"+data.id).show();
                 $("#school_address_edit_"+data.id).hide();