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'