gistfile1.diff

diff --git a/pages/app/controllers/refinery/admin/pages_controller.rb b/pages/app/controllers/refinery/admin/pages_controller.rb
index 4dd16da..01b2096 100644
--- a/pages/app/controllers/refinery/admin/pages_controller.rb
+++ b/pages/app/controllers/refinery/admin/pages_controller.rb
@@ -91,8 +91,7 @@ module Refinery
         @valid_layout_templates = Pages.layout_template_whitelist &
                                   Pages.valid_templates('app', 'views', '{layouts,refinery/layouts}', '*html*')
 
-        @valid_view_templates = Pages.view_template_whitelist &
-                                Pages.valid_templates('app', 'views', '{pages,refinery/pages}', '*html*')
+        @valid_view_templates = Pages.valid_templates('app', 'views', '{pages,refinery/pages}', '*html*')
       end
 
       def restrict_access
diff --git a/pages/app/views/refinery/admin/pages/_form_advanced_options.html.erb b/pages/app/views/refinery/admin/pages/_form_advanced_options.html.erb
index 5bbf709..4e95ee9 100644
--- a/pages/app/views/refinery/admin/pages/_form_advanced_options.html.erb
+++ b/pages/app/views/refinery/admin/pages/_form_advanced_options.html.erb
@@ -20,7 +20,6 @@
                    template_options(:layout_template, @page) %>
     </div>
     <% end %>
-    <% if Refinery::Pages.use_view_templates %>
     <div class='field'>
       <span class='label_with_help'>
         <%= f.label :view_template, t('.view_template') %>
@@ -29,7 +28,6 @@
       <%= f.select :view_template, @valid_view_templates.map { |t| [t.titleize, t] },
                    template_options(:view_template, @page) %>
     </div>
-    <% end %>
 
     <div class='field'>
       <span class='label_with_help'>
diff --git a/pages/lib/refinery/pages/render_options.rb b/pages/lib/refinery/pages/render_options.rb
index 3b95992..dddd7ab 100644
--- a/pages/lib/refinery/pages/render_options.rb
+++ b/pages/lib/refinery/pages/render_options.rb
@@ -7,11 +7,9 @@ module Refinery
         if Refinery::Pages.use_layout_templates && page.layout_template.present?
           render_options[:layout] = page.layout_template
         end
-        if Refinery::Pages.use_view_templates && page.view_template.present?
-          render_options[:template] = "refinery/pages/#{page.view_template}"
-        elsif
-          render_options[:template] = "refinery/pages/show"
-        end
+
+        render_options[:template] = "refinery/pages/#{page.view_template || 'show'}"
+
         render_options
       end
 
diff --git a/pages/spec/controllers/refinery/pages_controller_spec.rb b/pages/spec/controllers/refinery/pages_controller_spec.rb
new file mode 100644
index 0000000..4c71c11
--- /dev/null
+++ b/pages/spec/controllers/refinery/pages_controller_spec.rb
@@ -0,0 +1,24 @@
+require "spec_helper"
+
+module Refinery
+  describe PagesController do
+    before do
+      FactoryGirl.create(:page, :link_url => "/", :view_template => "home")
+      FactoryGirl.create(:page, :title => "test")
+    end
+
+    describe "#home" do
+      it "renders home template" do
+        get :home
+        expect(response).to render_template("home")
+      end
+    end
+
+    describe "#show" do
+      it "renders show template" do
+        get :show, :path => "test"
+        expect(response).to render_template("show")
+      end
+    end
+  end
+end