diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1b95ef895..7602b10a5 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -160,7 +160,7 @@ class AdminController < ApplicationController
@sort = ""
if params[:sort] && (params[:order] == 'name')
# courses = School.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) #{params[:sort]}, c.id desc")
- school = School.find_by_sql(" SELECT aas.name FROM apply_add_schools aas where aas.status = '0' GROUP BY CONVERT(name USING gbk) #{params[:sort]}, aas.id desc ")
+ school = School.find_by_sql(" SELECT aas.name FROM apply_add_schools aas where aas.status = '0' ORDER BY CONVERT(aas.name USING gbk) #{params[:sort]}, aas.id asc ")
@order = params[:order]
@sort = params[:sort]
end
diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index ec585e2b2..b927b1108 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -187,6 +187,12 @@ class SchoolController < ApplicationController
user_extention= User.current.extensions
user_extention.school_id = school.id
user_extention.save!
+
+ # status=4 向管理员发送信息
+ users = User.where(:admin => 1)
+ users.each do |user|
+ AppliedMessage.create(:user_id => user.id, :status => 4, :viewed => true, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name )
+ end
else
data[:result] = 3
end
diff --git a/app/views/admin/_all_schools.html.erb b/app/views/admin/_all_schools.html.erb
index af59d7687..d4cf916f5 100644
--- a/app/views/admin/_all_schools.html.erb
+++ b/app/views/admin/_all_schools.html.erb
@@ -1,5 +1,4 @@
<%= stylesheet_link_tag 'css/common','css/popup' %>
-
更改为
diff --git a/app/views/admin/applied_schools.html.erb b/app/views/admin/applied_schools.html.erb
index 32e67914f..507cb7c49 100644
--- a/app/views/admin/applied_schools.html.erb
+++ b/app/views/admin/applied_schools.html.erb
@@ -53,7 +53,7 @@
<%= apply.id %>
|
-
+ |
<%= apply.name %>
|
@@ -65,7 +65,7 @@
|
<%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city) %>
|
-
+ |
<%= apply.address %>
|
@@ -76,9 +76,9 @@
<%= format_date(apply.created_at) %>
|
- <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_schools', :id => apply.id }) %>
- <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'unapplied' },:method => :delete, :confirm => l(:text_are_you_sure)) %>
- <%=link_to '更改', admin_all_schools_path(:school_id =>apply.id), :remote => true %>
+ <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_schools', :id => apply.id }, :class => "application-default-link" ) %>
+ <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'unapplied' },:method => :delete, :confirm => l(:text_are_you_sure), :class => "application-default-link") %>
+ <%=link_to '更改', admin_all_schools_path(:school_id =>apply.id), :remote => true, :class => "application-default-link" %>
|
diff --git a/app/views/admin/has_applied_schools.html.erb b/app/views/admin/has_applied_schools.html.erb
index 11361dbac..555dce689 100644
--- a/app/views/admin/has_applied_schools.html.erb
+++ b/app/views/admin/has_applied_schools.html.erb
@@ -38,6 +38,9 @@
原名
|
+
+ 用户
+ |
创建时间
|
@@ -53,7 +56,7 @@
<%= apply.id %>
|
-
+ |
<% unless apply.school_id.nil? %>
<% school_name = School.where("id=?", apply.school_id).first %>
<%= school_name.name %>
@@ -71,12 +74,16 @@
<%= school_province.province %>
<% end %>
|
-
+ |
<%= apply.address %>
|
<%= apply.name %>
|
+
+ <% count = UserExtensions.where("school_id = #{apply.school_id}").count %>
+ <%= count %>
+ |
<%= format_date(apply.created_at) %>
|
@@ -84,16 +91,6 @@
<%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'applied' },:method => :delete, :confirm => l(:text_are_you_sure) ) %>
- <% unless apply.remarks.blank? %>
-
-
-
- |
-
- <%= apply.remarks %>
- |
-
- <% end %>
<% end %>
<% end %>
diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb
index 81cc2df9d..7f62da514 100644
--- a/app/views/layouts/base_admin.html.erb
+++ b/app/views/layouts/base_admin.html.erb
@@ -62,3 +62,10 @@
<%= call_hook :view_layouts_base_body_bottom %>