From 4e815a38b63878d41a033e0f094ed1b955443c3a Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Thu, 29 May 2014 15:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=B7=AF=E7=94=B1=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=8B=AC=E7=AB=8B=E5=87=BA=E6=9D=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=8C=85=E5=90=AB=E5=9C=A8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{projects => courses}/_course.html.erb    |  0
 .../_course_form.html.erb                     |  0
 config/routes.rb                              | 21 ++++++++++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)
 rename app/views/{projects => courses}/_course.html.erb (100%)
 rename app/views/{projects => courses}/_course_form.html.erb (100%)

diff --git a/app/views/projects/_course.html.erb b/app/views/courses/_course.html.erb
similarity index 100%
rename from app/views/projects/_course.html.erb
rename to app/views/courses/_course.html.erb
diff --git a/app/views/projects/_course_form.html.erb b/app/views/courses/_course_form.html.erb
similarity index 100%
rename from app/views/projects/_course_form.html.erb
rename to app/views/courses/_course_form.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 05041ac98..c3239154c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -261,8 +261,6 @@ RedmineApp::Application.routes.draw do
   end
   resources :projects do
     member do
-      post 'finishcourse'
-      post 'restartcourse'
       get 'settings(/:tab)', :action => 'settings', :as => 'settings'
       #by young
       get 'member', :controller => 'projects', :action => 'member', :as => 'member'
@@ -539,6 +537,20 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  # add by nwb
+  # 课程路由设置
+  resources :course do
+    member do
+      # 之前在项目
+      post 'finishcourse'
+      post 'restartcourse'
+     end
+  end
+  #match 'project/enterprise_course', :to => 'projects#enterprise_course'
+  #match 'project/course_enterprise', :to => 'projects#course_enterprise'
+  #match 'project/course', :to => 'projects#course', :as => 'course'
+
+
   match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
   match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
   match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
@@ -590,8 +602,7 @@ RedmineApp::Application.routes.draw do
   match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
   match 'calls/:id/fork', :to => 'bids#fork', :as => 'fork'
   match 'calls/:id/create_fork', :to => 'bids#create_fork'
-  match 'project/enterprise_course', :to => 'projects#enterprise_course'
-  match 'project/course_enterprise', :to => 'projects#course_enterprise'
+
   match 'calls/:id/show_course', :to => 'bids#show_course', :as => 'show_course'
   match 'calls/:id/show_bid_project', :to => 'bids#show_bid_project', :as => 'show_bid_project'
   match 'calls/:id/show_bid_user', :to => 'bids#show_bid_user', :as => 'show_bid_user'
@@ -611,7 +622,7 @@ RedmineApp::Application.routes.draw do
   match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
   match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
   match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post]
-  match 'project/course', :to => 'projects#course', :as => 'course'
+
 
   #added by william
   # match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results'