Merge 95a0986c02 into 137d997793

2018-03-09 02:36:53 +00:00 · 2018-03-09 02:36:53 +00:00 · 6d2fb01a7b
commit 6d2fb01a7b
parent 137d997793 95a0986c02
1 changed files with 7 additions and 2 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -213,6 +213,11 @@ Osem::Application.routes.draw do
  end

  get '/admin' => redirect('/admin/conferences')
-
-  root to: 'conferences#index', via: [:get, :options]
+  if Conference.all.count == 1 && Conference.first.splashpage 
+    conference_title=Conference.first.short_title
+    root to: 'conferences#show',id: conference_title
+  else
+    root to: 'conferences#index', via: [:get, :options]
+    
+  end
 end