From c7267f92999a0b61809ab29a628355c494cc1224 Mon Sep 17 00:00:00 2001 From: Pet Date: Tue, 15 May 2018 20:34:28 +0200 Subject: [PATCH] Added the verleihkalender view also to routes.rb --- config/routes.rb | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 896190e..40df6e1 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,8 +15,8 @@ get 'internlist' end end - resources :gremien do - collection do + resources :gremien do + collection do get 'verwalten' end end @@ -35,7 +35,7 @@ resources :choices end - + themes_for_rails devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } resources :home, :only=>[:index] do @@ -47,7 +47,7 @@ resources :emails, :only=>[:index] do end get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language" scope '(:locale)/admin' do - resources :users, :only=>[] do + resources :users, :only=>[] do collection do get :index post :all_update @@ -73,13 +73,14 @@ end end devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} - + scope '(:locale)', constraints: {:locale=>/en|de/i} do - get 't/:theme/:url', to: redirect('/%{url}') + get 't/:theme/:url', to: redirect('/%{url}') scope '(t/:theme)' do get "" , controller: :home, action: :index get "intern" , controller: :home, action: :intern get "infoscreen" , controller: :home, action: :infoscreen + get "verleihkalender" , controller: :home, action: :verleihkalender get "beispielsammlung", to: redirect('/studien') scope '(:ansicht)' do resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do @@ -88,11 +89,11 @@ end end end end - + resources :modulgruppen,:only =>[:create,:index] do end - - resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do + + resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do resources :modulgruppen, :path => "(:locale)/modulgruppen" end get 'verwalten/studien', :controller=>:studien, :action=>:verwalten, :as=>'studien_verwalten' @@ -102,7 +103,7 @@ end resources :moduls do member do get 'edit_lvas' - post 'update_lvas' + post 'update_lvas' get 'load_tiss' post 'show_tiss' end @@ -111,7 +112,7 @@ end get 'new_bulk' post 'update_bulk' end - + end resources :beispiele do #, :only=>[:show,:index,:create] member do @@ -121,7 +122,7 @@ end get 'set_lecturer' end end - resources :lvas do + resources :lvas do member do get 'beispiel_sammlung' get 'compare_tiss' @@ -130,8 +131,8 @@ end end resources :beispiele#, :only=>[:show,:index,:create] - end - + end + resources :fetzneditions resources :galleries do collection do @@ -139,14 +140,14 @@ end end resources :fotos end - - resources :gremien do - collection do + + resources :gremien do + collection do get 'verwalten' end end # resources :fetprofiles, as: :fetprofiles_bak do -# collection do +# collection do # get 'verwalten' # get 'internlist' # end @@ -158,12 +159,12 @@ end end end resources :fragen, :only =>[:new, :edit, :update, :destroy, :create] - - resources :neuigkeiten, :only => [:show] , constraints: {id: /\d+/i} + + resources :neuigkeiten, :only => [:show] , constraints: {id: /\d+/i} get "neuigkeiten", controller: :rubriken, action: :index, as: "neuigkeiten" resources :rubriken do - collection do + collection do get 'verwalten' , :action => :alle_verwalten get 'intern' end @@ -173,7 +174,7 @@ end get 'removemoderator' end - resources :neuigkeiten, :except => [:index] do + resources :neuigkeiten, :except => [:index] do member do get 'publish' get 'unpublish' @@ -197,7 +198,7 @@ end collection do get 'intern' get 'treeview' - get 'admin' + get 'admin' get 'dev' get 'startdev' get 'linksnotimplemented' @@ -208,14 +209,14 @@ end end resources :themengruppen do - get :verwalten + get :verwalten get :verwalten_all,:on=>:collection get :faqs, :on=>:collection post :sort_themen post :sort_themengruppen, :on=>:collection resources :themen, :only=>[:new, :show] end - + resources :themen do member do get :attachments @@ -227,14 +228,14 @@ end get :meetings end resources :attachments do - member do + member do get :set_titlepic end end - + end resources :attachments do - member do + member do get :set_titlepic end collection do @@ -260,12 +261,12 @@ end member do get :announce get :create_protocol - get :create_agenda + get :create_agenda end - + end - - + + resources :meetingtyps do member do get :create_protocol_and_agenda @@ -275,5 +276,3 @@ end end root :to => 'home#index' end - -