finished some method of list and journal
This commit is contained in:
Rueshyna committed
1 parent
024b331cf3
commit
26436395f5
20 files changed
+306
-316
No files matched your search
+48
-79
@@ -2,7 +2,7 @@ Orbit::Application.routes.draw do
|
||||
|
||||
devise_for :users
|
||||
mount Resque::Server, :at => "/admin/resque"
|
||||
|
||||
|
||||
# routes for sinatra app
|
||||
match '/site/set_registered', :to => CentralServerExchangeApp
|
||||
match '/site/public_key', :to => CentralServerExchangeApp
|
||||
@@ -28,7 +28,7 @@ Orbit::Application.routes.draw do
|
||||
match 'new_interface' => "object_auths_new_interface#setting" ,:as => :ob_auth,:via => :get
|
||||
match 'new_interface' => "object_auths_new_interface#update_setting" ,:as => :ob_auth,:via => :post
|
||||
match 'new_interface' => "object_auths_new_interface#user_list" ,:as => :ob_auth_show,:via => :put
|
||||
|
||||
|
||||
collection do
|
||||
match 'new/:type/:obj_id',:action => 'new',:via => "get",:as => :init
|
||||
end
|
||||
@@ -43,11 +43,11 @@ Orbit::Application.routes.draw do
|
||||
match 'ad_banners/:id/rename' => 'ad_banners#rename',:as => :rename_ad_banner,:via => :post
|
||||
|
||||
resources :ad_banners do
|
||||
collection do
|
||||
match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
|
||||
match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
|
||||
end
|
||||
resources :ad_images ,:except => [:show,:index]
|
||||
collection do
|
||||
match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
|
||||
match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
|
||||
end
|
||||
resources :ad_images ,:except => [:show,:index]
|
||||
end
|
||||
resources :dashboards
|
||||
resources :designs do
|
||||
@@ -87,7 +87,7 @@ Orbit::Application.routes.draw do
|
||||
match 'remove/:type/:target_id' ,:action=> 'remove',:via => "delete",:as =>:remove
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
member do
|
||||
match 'assign_manager' ,:action=> 'assign_manager',:via => "post",:as =>:assign_manager
|
||||
match 'assign_sub_manager' ,:action=> 'assign_sub_manager',:via => "post",:as =>:assign_sub_manager
|
||||
@@ -136,78 +136,47 @@ Orbit::Application.routes.draw do
|
||||
|
||||
end
|
||||
# end admin
|
||||
|
||||
|
||||
namespace :panel do
|
||||
resources :users
|
||||
end
|
||||
|
||||
resources :desktop_widgets do
|
||||
collection do
|
||||
get 'upload'
|
||||
get 'delete'
|
||||
post 'upload'
|
||||
get 'upload'
|
||||
get 'delete'
|
||||
post 'upload'
|
||||
end
|
||||
end
|
||||
|
||||
namespace :desktop do
|
||||
|
||||
match "/"=>"desktop#index"
|
||||
namespace :desktop do
|
||||
|
||||
# Sinatra Routes start
|
||||
match "/" => "desktop#index"
|
||||
|
||||
# match '/desktop/desktop', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/app_manager', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/sections', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/settings', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/get_desktop_settings/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/save_desktop_settings/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/getgroups/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/getsectionlist/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/settingthemes/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/settingsections/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/getapplist/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/newpositions/', :to => Desktopapp::DesktopApp
|
||||
# match '/desktop/settingconnection/', :to => Desktopapp::DesktopApp
|
||||
match '/desktop'=>'desktop#desktop'
|
||||
match '/app_manager'=>'desktop#app_manager'
|
||||
match '/sections'=>'desktop#sections'
|
||||
match '/settings'=>'desktop#settings'
|
||||
match '/get_desktop_settings/'=>'desktop#get_desktop_settings'
|
||||
match '/save_desktop_settings/'=>'desktop#save_desktop_settings'
|
||||
match '/getgroups/'=>'desktop#getgroups'
|
||||
match '/getsectionlist/'=>'desktop#getsectionlist'
|
||||
match '/themes/'=>'desktop#themes'
|
||||
match '/sections/'=>'desktop#sections'
|
||||
match '/getapplist/'=>'desktop#getapplist'
|
||||
match '/newpositions/'=>'desktop#newpositions'
|
||||
match '/connections/'=>'desktop#connections'
|
||||
match '/widget_layout' => 'desktop#widget_layout'
|
||||
|
||||
# match '/desktop/journal_p/', :to => Desktopapp::DesktopAppPublications
|
||||
# match '/desktop/journal_p_list/', :to => Desktopapp::DesktopAppPublications
|
||||
# match '/desktop/journal_p_add/', :to => Desktopapp::DesktopAppPublications
|
||||
# match '/desktop_publications/getjournals', :to => Desktopapp::DesktopAppPublications
|
||||
match '/temp_func/'=>'desktop#temp_func'
|
||||
resources :journal_pages
|
||||
end
|
||||
|
||||
# match '/desktop/twitter/', :to => Desktopapp::Otheraccounts
|
||||
# match '/desktop/forgmail/', :to => Desktopapp::Otheraccounts
|
||||
# match '/desktop/getaccounts', :to => Desktopapp::Otheraccounts
|
||||
# match '/desktop/save_account_info/', :to => Desktopapp::Otheraccounts
|
||||
|
||||
# match '/desktop_appstore/appstore', :to => Desktopapp::DesktopAppAppstore
|
||||
# match '/desktop_appstore/widgets', :to => Desktopapp::DesktopAppAppstore
|
||||
# match '/desktop_appstore/getuserwidgets', :to => Desktopapp::DesktopAppAppstore
|
||||
# match '/desktop_appstore/widgets_settings', :to => Desktopapp::DesktopAppAppstore
|
||||
|
||||
# Sinatra Routes end
|
||||
|
||||
match '/desktop'=>'desktop#desktop'
|
||||
match '/app_manager'=>'desktop#app_manager'
|
||||
match '/sections'=>'desktop#sections'
|
||||
match '/settings'=>'desktop#settings'
|
||||
match '/get_desktop_settings/'=>'desktop#get_desktop_settings'
|
||||
match '/save_desktop_settings/'=>'desktop#save_desktop_settings'
|
||||
match '/getgroups/'=>'desktop#getgroups'
|
||||
match '/getsectionlist/'=>'desktop#getsectionlist'
|
||||
match '/themes/'=>'desktop#themes'
|
||||
match '/sections/'=>'desktop#sections'
|
||||
match '/getapplist/'=>'desktop#getapplist'
|
||||
match '/newpositions/'=>'desktop#newpositions'
|
||||
match '/connections/'=>'desktop#connections'
|
||||
match '/widget_layout' => 'desktop#widget_layout'
|
||||
|
||||
match '/temp_func/'=>'desktop#temp_func'
|
||||
end
|
||||
|
||||
# namespace :desktop_publications do
|
||||
match 'desktop_publications/journal_p'=>'desktop_publications#journal_p'
|
||||
match 'desktop_publications/journal_p_list'=>'desktop_publications#journal_p_list'
|
||||
match 'desktop_publications/journal_p_add'=>'desktop_publications#journal_p_add'
|
||||
# namespace :desktop_publications do
|
||||
match 'desktop_publications/journal_p'=>'desktop_publications#journal_p'
|
||||
# match 'desktop_publications/journal_p_list'=>'desktop_publications#journal_p_list'
|
||||
# match 'desktop_publications/journal_p_add'=>'desktop_publications#journal_p_add'
|
||||
# match 'desktop_publications/journal_p_create'=>'desktop_publications#journal_p_create' , :via => :post
|
||||
match 'desktop_publications/books' => 'desktop_publications#books'
|
||||
match 'desktop_publications/books_list'=>'desktop_publications#books_list'
|
||||
match 'desktop_publications/books_add'=>'desktop_publications#books_add'
|
||||
@@ -216,9 +185,9 @@ end
|
||||
match 'desktop_publications/seminar_p_list/'=>'desktop_publications#seminar_p_list'
|
||||
match 'desktop_publications/seminar_p_add/'=>'desktop_publications#seminar_p_add'
|
||||
match 'desktop_publications/getjournals' => 'desktop_publications#getjournals'
|
||||
# end
|
||||
# end
|
||||
|
||||
# namespace :desktop_research do
|
||||
# namespace :desktop_research do
|
||||
match 'desktop_research/research_d' => 'desktop_research#research_d'
|
||||
match 'desktop_research/research_d_list/' => 'desktop_research#research_d_list'
|
||||
match 'desktop_research/research_d_add' => 'desktop_research#research_d_add'
|
||||
@@ -226,7 +195,7 @@ end
|
||||
match 'desktop_research/research_p' => 'desktop_research#research_p'
|
||||
match 'desktop_research/research_p_list/' => 'desktop_research#research_p_list'
|
||||
match 'desktop_research/research_p_add' => 'desktop_research#research_p_add'
|
||||
# end
|
||||
# end
|
||||
|
||||
match '/twitter/'=>'otheraccounts#twitter'
|
||||
match '/forgmail/'=>'otheraccounts#gmail'
|
||||
@@ -243,36 +212,36 @@ end
|
||||
|
||||
match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
|
||||
match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan'
|
||||
|
||||
|
||||
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#create_journal'
|
||||
|
||||
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#create_journal'
|
||||
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
|
||||
# match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
|
||||
!request.query_string.include?("inner=true")
|
||||
}
|
||||
|
||||
|
||||
match '/panel/:app_name/front_end/:app_action' => 'pages#index_from_link', :constraints => lambda { |request|
|
||||
!request.query_string.include?("inner=true")
|
||||
}
|
||||
|
||||
match '/share/:model/:id' => 'application#render_share'
|
||||
|
||||
|
||||
# routes for gridfs files
|
||||
match "/gridfs/*path" => "gridfs#serve"
|
||||
|
||||
# match "/images/*path" => "gridfs#serve_images"
|
||||
# match "/admin/pages/images/*path" => "gridfs#serve_images"
|
||||
|
||||
|
||||
# routes for pages to generate
|
||||
match '*page_name' => 'pages#show', :as => :page, :constraints => lambda{|request|
|
||||
!request.path.starts_with?("/panel")
|
||||
}
|
||||
|
||||
|
||||
root :to => 'pages#index'
|
||||
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user