both manual and automatic methods working

Conflicts:
	config/routes.rb
This commit is contained in:
saurabhbhatia authored and Manson Wang committed 2014-01-23 12:01:16 +08:00
1 parent 69d588b9ef
commit f59452ffc4
4 files changed
+222 -9

No files matched your search

+3 -3
View File
@@ -8,13 +8,13 @@ defaults: &defaults
development:
<<: *defaults
database: orbit_site_new
database: ntu_mb_orbit_2_new
test:
<<: *defaults
database: orbit_site_new
database: ntu_mb_orbit_2_new
# set these environment variables on your prod server
production:
@@ -24,4 +24,4 @@ production:
# password: <%= ENV['MONGOID_PASSWORD'] %>
# database: <%= ENV['MONGOID_DATABASE'] %>
<<: *defaults
database: orbit_site_new
database: ntu_mb_orbit_2_new
+13
View File
@@ -218,6 +218,19 @@ Orbit::Application.routes.draw do
get 'update_orbit'
get 'restart_server'
end
get "import_data/get_teacher_data"
get "import_data/get_book_data"
get "import_data/get_conference_data"
get "import_data/get_journal_paper_data"
get "import_data/get_announcement_data"
get "import_data/get_page_data"
get "import_data/sync_book_data"
get "import_data/sync_journal_paper_data"
get "import_data/sync_conference_data"
get "import_data/sync_book_data_auto"
get "import_data/sync_journal_paper_data_auto"
get "import_data/sync_conference_data_auto"
resources :tags do
collection do