diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 7602b10a5..935ca1d71 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -615,8 +615,10 @@ class AdminController < ApplicationController # 获取申请的高校列表 # status: 0 未审批； 1 已批阅； def applied_schools - @name = params[:name] - @apply_status = ApplyAddSchools.where(:status => 0).order('created_at desc') + @name = params[:name] || "" + condition = "#{@name.strip}".gsub(" ","") + + @apply_status = ApplyAddSchools.where("status = 0 and name like '%#{condition}%'").order('created_at desc') @apply_count = @apply_status.count @apply_pages = Paginator.new @apply_count, 30, params['page'] || 1 @@ -629,8 +631,10 @@ class AdminController < ApplicationController end def has_applied_schools - @name = params[:name] - @has_apply_status = ApplyAddSchools.where("status = 1 or status = 2").order('created_at desc') + @name = params[:name] || "" + condition = "#{@name.strip}".gsub(" ","") + + @has_apply_status = ApplyAddSchools.where("(status = 1 or status = 2) and name like '%#{condition}%'").order('created_at desc') @has_apply_count = @has_apply_status.count @has_apply_pages = Paginator.new @has_apply_count, 30, params['page'] || 1 diff --git a/app/views/admin/applied_schools.html.erb b/app/views/admin/applied_schools.html.erb index c9ebdfb66..2f139ca72 100644 --- a/app/views/admin/applied_schools.html.erb +++ b/app/views/admin/applied_schools.html.erb @@ -53,14 +53,14 @@ <%= apply.id %> - - <%= apply.name %> + + <%= apply.name %> <% user = User.where("id=?", apply.user_id).first %> <% unless user.nil? %> - <%=link_to user.show_name, user_path(user) %> + <%=link_to user.show_name, user_path(user),:target => '_blank' %> <% end %> @@ -141,4 +141,7 @@ <% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/admin/has_applied_schools.html.erb b/app/views/admin/has_applied_schools.html.erb index b0419bcab..5be3517c8 100644 --- a/app/views/admin/has_applied_schools.html.erb +++ b/app/views/admin/has_applied_schools.html.erb @@ -23,7 +23,7 @@ 序号 - + 单位名称 @@ -41,7 +41,7 @@ 用户 - + 创建时间 @@ -56,7 +56,7 @@ <%= apply.id %> - + <% unless apply.school_id.nil? %> <% school_name = School.where("id=?", apply.school_id).first %> <%= school_name %> @@ -64,9 +64,9 @@ <% end %> - <% user = User.where("id=?", apply.user_id).first %> + <% user = User.where("id=?", apply.user_id).first%> <% unless user.nil? %> - <%=link_to user.show_name, user_path(user) %> + <%=link_to user.show_name, user_path(user), :target => '_blank'%> <% end %> @@ -137,4 +137,7 @@ <% end %> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb index e6fcfb25d..dd1b787fd 100644 --- a/app/views/users/_user_message_applied.html.erb +++ b/app/views/users/_user_message_applied.html.erb @@ -4,33 +4,39 @@ <% if ma.status == 1 || ma.status == 2 || ma.status == 3 || ma.status == 4 %>