remove redirect to /products when no homepage is present

iloveitaly · Aug 24, 2012 · cee0851 · cee0851
1 parent 0d63fab
commit cee0851
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/app/controllers/spree/home_controller_decorator.rb b/app/controllers/spree/home_controller_decorator.rb
@@ -12,8 +12,6 @@ def index
 
     def get_homepage
       @page = Spree::Page.find_by_path("/")
-      redirect_to products_url if @page.nil?
-      @page
     end
 
     def accurate_title

diff --git a/app/views/spree/pages/home.html.erb b/app/views/spree/pages/home.html.erb
@@ -1,17 +1,19 @@
-<% unless @page.images.empty? %>
-  <%= render 'spree/shared/slideshow', :images => @page.images, :size => :slide %>
-<% end %>
-
-<% if @page.has_context?('intro') %>
-  <div class="intro">
-    <%= render 'spree/shared/content', :content => @page.for_context('intro').first %>
+<% unless @page.nil? %>
+  <% unless @page.images.empty? %>
+    <%= render 'spree/shared/slideshow', :images => @page.images, :size => :slide %>
+  <% end %>
+  
+  <% if @page.has_context?('intro') %>
+    <div class="intro">
+      <%= render 'spree/shared/content', :content => @page.for_context('intro').first %>
+    </div>
+  <% end %>
+
+  <div class="left">
+    <%= render :partial => 'spree/shared/content', :collection => @page.for_context('main') %>
   </div>
 <% end %>
 
-<div class="left">
-  <%= render :partial => 'spree/shared/content', :collection => @page.for_context('main') %>
-</div>
-
 <div class="right">
   <% if defined?(Spree::SpreeEssentialBlog) && !@posts.blank? %>
     <div class="home-posts">
@@ -34,5 +36,5 @@
 <% end %>
 
 <div data-hook="homepage_products">
-  <%= render :partial => 'spree/shared/products', :locals => { :products => @products } %>
+  <%= render :partial => 'spree/shared/products', :locals => { :products => @products } if @products %>
 </div>
diff --git a/test/integration/spree/home_integration_test.rb b/test/integration/spree/home_integration_test.rb
@@ -7,9 +7,9 @@ class Spree::HomeIntegrationTest < SpreeEssentials::IntegrationCase
     @images = Dir[File.expand_path("../../../../lib/tasks/sample", __FILE__) + "/*.jpg"]
   end
 
-  should "redirect to products when no homepage is present" do
+  should "not redirect to products when no homepage is present" do
     visit "/"
-    assert_equal spree.products_path, current_path
+    assert_equal "/", current_path
   end
 
   context "an existing homepage" do