diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index b018e38d..ea6b37dc 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -29,7 +29,7 @@ class ManagementsController < ApplicationController
end
def user_agents
- @user_agents = UserAgent.where("user_agents.key is not null")
+ @user_agents = UserAgent.where("user_agents.key is not order by action_status, register_status")
@agents_count = @user_agents.count
limit = 20
@agents_pages = Paginator.new @agents_count, limit, params['page'] || 1
diff --git a/app/views/managements/_user_agent_list.html.erb b/app/views/managements/_user_agent_list.html.erb
index 43886c8d..6b47e51c 100644
--- a/app/views/managements/_user_agent_list.html.erb
+++ b/app/views/managements/_user_agent_list.html.erb
@@ -4,9 +4,9 @@
代理人登录名 |
代理人姓名 |
学校 |
+ 用户注册状态 |
竞赛报名状态 |
ip |
- ip |
负责人 |
@@ -19,9 +19,10 @@
<%= link_to ua.key, user_path(ua.key), :target => "_blank" %> |
<%= link_to user.try(:show_real_name), user_path(user), target:'_blank' %> |
<%= school.name %> |
- <%= "--" %> |
+ <%= ua.action_status == 2 ? "代理之后注册" : "--" %> |
+ <%= ua.register_status == 2 ? "代理之后报名" : "--" %> |
<%= ua.ip %> |
- <%= "理由" %> |
+ "--" |
<% end %>
diff --git a/app/views/managements/user_agents.html.erb b/app/views/managements/user_agents.html.erb
index d29e7bec..a1e88ef0 100644
--- a/app/views/managements/user_agents.html.erb
+++ b/app/views/managements/user_agents.html.erb
@@ -1,19 +1,10 @@
-<%= form_tag(url_for(departments_part_managements_path),:id=>"department_part_search",:method => "post",:remote=>true) do %>
-
-
-
搜索
-
清除
- <%= link_to "关联代理人",add_departments_part_managements_path(),:class => "task-btn task-btn-green fr mt6 mr30" %>
-
-
-<% end %>
<%= render :partial => "managements/user_agent_list" %>
\ No newline at end of file