From 3b4bf8b99d26cb870ce2e7edb0c5aa7c96471a46 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 5 Mar 2015 14:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E7=9A=84in?=
 =?UTF-8?q?dex=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=BB=A5=E5=8F=8Aindex=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=88=B0=E7=BB=84=E7=BB=87=E9=A6=96=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organization_controller.rb  | 10 +++++++
 app/controllers/organizations_controller.rb |  6 ----
 app/views/organization/index.html.erb       | 31 +++++++++++++++++++++
 app/views/organizations/index.html.erb      | 23 ---------------
 config/routes.rb                            |  8 +++---
 5 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 app/controllers/organization_controller.rb
 delete mode 100644 app/controllers/organizations_controller.rb
 create mode 100644 app/views/organization/index.html.erb
 delete mode 100644 app/views/organizations/index.html.erb

diff --git a/app/controllers/organization_controller.rb b/app/controllers/organization_controller.rb
new file mode 100644
index 000000000..ef0919ced
--- /dev/null
+++ b/app/controllers/organization_controller.rb
@@ -0,0 +1,10 @@
+class OrganizationController < ApplicationController
+  layout 'project_base'
+  def index
+    #@projects = Project.find_by_sql("SELECT * FROM projects WHERE id  IN (select MAX(id) from projects GROUP BY enterprise_name)")
+    @organizations = Organization.all
+    respond_to do |format|
+      format.html
+    end
+  end
+end
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
deleted file mode 100644
index c9cce5752..000000000
--- a/app/controllers/organizations_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class OrganizationsController < ApplicationController
-  layout 'project_base'
-  def index
-    @projects = Project.find_by_sql("SELECT * FROM projects WHERE id  IN (select MAX(id) from projects GROUP BY enterprise_name)")
-  end
-end
diff --git a/app/views/organization/index.html.erb b/app/views/organization/index.html.erb
new file mode 100644
index 000000000..2f657831a
--- /dev/null
+++ b/app/views/organization/index.html.erb
@@ -0,0 +1,31 @@
+<title>
+  <%= l(:label_all_enterprises) %>
+</title>
+<div class="content_syqy">
+	<div class="list">
+      <%= l(:label_all_enterprises) %>
+    </div>
+    <div class="syqy_box">
+    	<% if @organizations.empty? %>
+			<h3>
+              <%= l(:label_enterprise_nil)  %>
+            </h3>
+		<% else %>
+			<% @organizations.each do |organization| %>
+				<% unless organization.name.blank? %>
+                    <ul>
+                        <li >
+                          <img src="/images/organization_logo.jpg" width="30" height="30" alt="#{project.enterprise_name}" />
+                          <%= link_to organization.name,  home_path(:organization => organization.id) %>
+                        </li>
+                    </ul>
+        		<% end %>
+        	<% end %>
+        <% end %>
+    </div>
+</div>
+<div style="clear: both"></div>
+<div class="school-index">
+	<ul id="schoollist" style="line-height: 25px"></ul>
+</div>
+<% html_title(l(:label_enterprise_all)) -%>
diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb
deleted file mode 100644
index 45813ced5..000000000
--- a/app/views/organizations/index.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<title><%= l(:label_all_enterprises) %></title>
-<div class="content_syqy">
-	<div class="list"><%= l(:label_all_enterprises) %></div>
-    <div class="syqy_box">
-    	<% if @projects.count == 0 %>
-			<h3><%= l(:label_enterprise_nil)  %></h3>
-		<% else %>
-			<% @projects.each do |organization| %>
-				<% unless organization.enterprise_name.blank? %>
-    	<ul>
-        	<li ><img src="/images/organization_logo.jpg" width="30" height="30" alt="#{project.enterprise_name}" />
-        		<%= link_to organization.enterprise_name,  home_path(:organization => organization) %></li>            
-        </ul>
-        		<% end %>
-        	<% end %>
-        <% end %>
-    </div>
-</div>
-<div style="clear: both"></div>
-<div class="school-index">
-	<ul id="schoollist" style="line-height: 25px"></ul>
-</div>
-<% html_title(l(:label_enterprise_all)) -%>
diff --git a/config/routes.rb b/config/routes.rb
index bf0b73e8d..6756a713d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,9 +26,6 @@
 # Example: :via =>  :get ====> :via => :get
 
 RedmineApp::Application.routes.draw do
-  get "organizations/index"
-
-  #match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
 
   mount Mobile::API => '/api'
 
@@ -39,6 +36,10 @@ RedmineApp::Application.routes.draw do
   resources :apply_project_masters
   delete 'apply_project_masters', :to => 'apply_project_masters#delete'
 
+  resources :organization, :only => [:index] do
+
+  end
+
   resources :homework_attach do
     collection do
       get 'get_homework_member_list'
@@ -390,7 +391,6 @@ RedmineApp::Application.routes.draw do
     match '/statistics', :to => 'projects#statistics',  :as => 'statistics', :via => :get
     #   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
     match '/homework', :to => 'projects#homework', :as => 'homework', :via => :get
-    match 'organizations', :to => 'organizations#index', :as => 'index', :via => :get
     
     #   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
     #   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get