From 35172dab59b11b64c3012d07b355bb3e8005cbde Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 25 Jul 2016 10:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=94=B3=E8=AF=B7=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb | 22 ++++++++++++++++++++++
 app/models/apply_add_schools.rb     |  1 +
 config/locales/zh.yml               |  1 +
 config/routes.rb                    |  1 +
 lib/redmine.rb                      |  1 +
 5 files changed, 26 insertions(+)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 6c62c642a..6d55cca53 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -598,6 +598,28 @@ class AdminController < ApplicationController
       format.html
     end
   end
+
+  # 获取申请的高校列表
+  # status: 0 未审批； 1 已批阅；
+  def applied_schools
+    @apply_status = ApplyAddSchools.where(:status => 0)
+  end
+
+  # 更改申请的高校名称
+  # REDO: 修改该字段
+  # REDO: 同步修改使用了改名称的用户单位
+  def edit_applied_schools
+
+  end
+
+  # 删除申请的高校
+  # REDO: destroy关联删除
+  # REDO: 删除确认提示，是否删除
+  # REDO: 给申请人发送消息
+  def delete_applied_schools
+
+  end
+
   #移动端版本管理
   def mobile_version
     @versions = PhoneAppVersion.reorder('created_at desc')
diff --git a/app/models/apply_add_schools.rb b/app/models/apply_add_schools.rb
index efa56e808..63f2f8caa 100644
--- a/app/models/apply_add_schools.rb
+++ b/app/models/apply_add_schools.rb
@@ -1,4 +1,5 @@
 class ApplyAddSchools < ActiveRecord::Base
+  # status：0 未审批 ； 1 已批阅
   attr_accessible :address, :city, :name, :province, :remarks, :school_id, :status
   belongs_to :school
 end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9c19fcbbb..4b8ecee81 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -388,6 +388,7 @@ zh:
   label_organization_name: 组织名称
   label_organization_list: 组织列表
   label_school_plural: 学校列表
+  label_applied_shcools: 单位名称列表
   label_organization_new: 新建组织
   label_edit_organization: 编辑组织
   label_organization_edit: 修改组织
diff --git a/config/routes.rb b/config/routes.rb
index 1124080b7..b969b7fca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1069,6 +1069,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/default_configuration', :via => :post
   get 'admin/organization'
   get 'admin/schools'
+  get 'admin/applied_schools'
   get 'admin/leave_messages'
   match 'admin/messages_list', as: :messages_list
   match 'admin/project_messages', as: :project_messages
diff --git a/lib/redmine.rb b/lib/redmine.rb
index ed40b4c04..29167d4a8 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -371,6 +371,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural
   menu.push :messages, {:controller => 'admin', :action => 'messages'}, :caption => :label_system_message
   menu.push :schools, {:controller => 'admin', :action => 'schools'}, :caption => :label_school_plural
+  menu.push :applied_schools, {:controller => 'admin', :action => 'applied_schools'}, :caption => :label_applied_shcools
   menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made
   menu.push :mobile_version, {:controller => 'admin',:action => 'mobile_version'},:caption => :label_mobile_version
   menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural