bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Die Jun 16 16:03:07 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-16 16:03:07 +02:00
parent 3c5ca56b13
commit efe17c681f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@@ -51,6 +51,6 @@ def current_ability
@current_ability ||= Ability.new(current_user, request, params[:key]) @current_ability ||= Ability.new(current_user, request, params[:key])
end end
def default_url_options def default_url_options
{locale: I18n.locale, theme: nil , ansicht: nil} {locale: nil, theme: nil , ansicht: nil} # I18n.locale
end end
end end

7
config/routes.rb
View File

@@ -32,8 +32,10 @@
devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
scope '(:locale)' do scope '(:locale)', constraints: {:locale=>/en|de/i} do
scope '(t/:theme)' do scope '(t/:theme)' do
get "" , controller: :home, action: :index
get "intern" , controller: :home, action: :intern
scope '(:ansicht)' do scope '(:ansicht)' do
resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do
@@ -107,7 +109,8 @@
resources :fragen, :only =>[:new, :edit, :update, :destroy, :create] resources :fragen, :only =>[:new, :edit, :update, :destroy, :create]
resources :neuigkeiten, :only => [:show] resources :neuigkeiten, :only => [:show] , constraints: {id: /\d+/i}
get "neuigkeiten", controller: :rubriken, action: :index, as: "neuigkeiten"
resources :rubriken do resources :rubriken do
collection do collection do
get 'verwalten' , :action => :alle_verwalten get 'verwalten' , :action => :alle_verwalten