Changeset d615d174087ec3b764e19b0799273741a6c8dee6

Timestamp:

07/27/10 23:10:33 (6 weeks ago)

Author:

Alban Peignier <alban@…>

Parents:

acff4dc3eee6e062cc1a86e06e6fd6fba910ee78

git-committer:

Alban Peignier <alban@tryphon.eu> / 2010-07-27T23:10:33Z+0200

Message:

Fix PublicController#welcome? loop when Show isn't found. Refs #14

Files:

• app/controllers/public_controller.rb (modified) (4 diffs)

app/controllers/public_controller.rb

@@ -7 +7 @@
   append_view_path "#{Rails.root}/templates"
 
-  before_filter :assigns_show, :create_user_google_analytics_account, :except => [:feed, :robots]
+  before_filter :assigns_show, :create_user_google_analytics_account, :except => [:feed, :robots, :welcome]
   before_filter :assigns_now
 
@@ -13 +13 @@
 
   def welcome
-    if @show.blank?
+    begin
+      load_show
+      render_show
+    rescue ActiveRecord::RecordNotFound
       # localhost is used in development
       # www.example.com is used by cucumber
-      if request.host =~ /(www.)bonnes-ondes\.fr|bonnes-ondes\.local|localhost|www.example.com/
-        @episodes_last =  Episode.find(:all, :order => "created_at DESC", :limit => 10)
+      if request.host =~ /www.bonnes-ondes\.fr|www.bonnes-ondes\.local|localhost|www.example.com/
+        @episodes_last =  Episode.find :all, :order => "created_at DESC", :limit => 10
       else
         raise ActiveRecord::RecordNotFound
       end
-    else
-      render_show
     end
   end
@@ -92 +93 @@
 
   def show_home_page_when_not_found
+    logger.info "Page not found for #{request.host}#{request.path}"
     flash[:notice] = "La page demandée n'existe pas"
-    redirect_to "/"
+    unless request.path == "/"
+      redirect_to "/"
+    else
+      redirect_to "http://www.bonnes-ondes.fr"
+    end
   end
 
@@ -118 +124 @@
       request.google_analytics_account = Rubaidh::GoogleAnalytics.new(user_tracker_id)
     end
+  rescue ActiveRecord::RecordNotFound
+    logger.debug "Can't find an associated Show for Goggle Analytics account"
   end