diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index aab9d7b69..1efbb665f 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -322,4 +322,11 @@ class AdminController < ApplicationController end end + #组织 + def organization + @organizations = Organization.all + respond_to do |format| + format.html + end + end end diff --git a/app/views/admin/organization.html.erb b/app/views/admin/organization.html.erb new file mode 100644 index 000000000..9d07aa0df --- /dev/null +++ b/app/views/admin/organization.html.erb @@ -0,0 +1 @@ +111 \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e9efa7fba..362838800 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -538,6 +538,7 @@ zh: label_project: 项目 label_activity_project: '项目: ' #added by bai + label_organization_list: 组织列表 label_project_plural: 项目列表 label_first_page_made: 首页定制 label_project_first_page: 项目托管平台首页 diff --git a/config/routes.rb b/config/routes.rb index 6756a713d..fb4e40e49 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -646,6 +646,7 @@ RedmineApp::Application.routes.draw do match 'admin/info', :via => :get match 'admin/test_email', :via => :get match 'admin/default_configuration', :via => :post + get 'admin/organization' resources :auth_sources do member do diff --git a/lib/redmine.rb b/lib/redmine.rb index cd855e01a..5cfd8bae8 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -360,6 +360,7 @@ Redmine::MenuManager.map :homework_menu do |menu| end ########end Redmine::MenuManager.map :admin_menu do |menu| + menu.push :organization, {:controller => 'admin', :action => 'organization'}, :caption => :label_organization_list menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made