content_controller.rb in we5-browsercms-3.1.0

- old
+ new

@@ -1,46 +1,28 @@
 class Cms::ContentController < Cms::ApplicationController
+  include Cms::ContentRenderingSupport
 
-  rescue_from Exception, :with => :handle_server_error_on_page
-  rescue_from Cms::Errors::AccessDenied, :with => :handle_access_denied_on_page
-  rescue_from ActiveRecord::RecordNotFound, :with => :handle_not_found_on_page
-
   skip_before_filter :redirect_to_cms_site
   before_filter :redirect_non_cms_users_to_public_site, :only => [:show, :show_page_route]
   before_filter :construct_path,                        :only => [:show]
   before_filter :construct_path_from_route,             :only => [:show_page_route]
   before_filter :try_to_redirect,                       :only => [:show]
   before_filter :try_to_stream_file,                    :only => [:show]
   before_filter :check_access_to_page,                  :only => [:show, :show_page_route]
 
+
+  
   # ----- Actions --------------------------------------------------------------
   def show
     render_page_with_caching
   end
 
   def show_page_route
     render_page_with_caching
   end
 
-  # ----- Error Handlers -------------------------------------------------------
-  
-  def handle_not_found_on_page(exception)
-    logger.warn "Page Not Found"
-    handle_error_with_cms_page('/system/not_found', exception, :not_found)
-  end
 
-  def handle_access_denied_on_page(exception)
-    logger.warn "Access Denied"
-    handle_error_with_cms_page('/system/access_denied', exception, :forbidden)
-  end
-
-  def handle_server_error_on_page(exception)
-    logger.warn "Exception: #{exception.message}\n"
-    logger.warn "#{exception.backtrace.join("\n")}\n"
-    handle_error_with_cms_page('/system/server_error', exception, :internal_server_error)
-  end
-
   # Used by the rendering behavior
   def instance_variables_for_rendering
     instance_variables - (@initial_ivars || []) - ["@initial_ivars"]
   end
 
@@ -65,71 +47,9 @@
   def render_page_with_caching
     render_page
     cache_page if perform_caching
   end
   
-  # This is the method all error handlers delegate to
-  def handle_error_with_cms_page(error_page_path, exception, status, options={})
-
-    # If we are in the CMS, we just want to show the exception
-    if perform_caching
-      return handle_server_error(exception) if cms_site?
-    else
-      return handle_server_error(exception) if current_user.able_to?(:edit_content, :publish_content)
-    end
-    
-    # We must be showing the page outside of the CMS
-    # So we will show the error page
-    if @page = Page.find_live_by_path(error_page_path)
-      logger.info "Rendering Error Page: #{@page.inspect}"
-      @mode = "view"
-      @show_page_toolbar = false
-      
-      # copy new instance variables to the template
-      %w[page mode show_page_toolbar].each do |v|
-        @template.instance_variable_set("@#{v}", instance_variable_get("@#{v}"))
-      end
-      
-      # clear out any content already captured 
-      # by previous attempts to render the page within this request
-      @template.instance_variables.select{|v| v =~ /@content_for_/ }.each do |v|
-        @template.instance_variable_set("#{v}", nil)
-      end
-      
-      prepare_connectables_for_render
-      render :layout => @page.layout, :template => 'cms/content/show', :status => status
-    else
-      handle_server_error(exception)
-    end      
-  end   
-  
-  # If any of the page's connectables (portlets, etc) are renderable, they may have a render method
-  # which does "controller" stuff, so we need to get that run before rendering the page.
-  def prepare_connectables_for_render
-
-    @_connectors = @page.connectors.for_page_version(@page.version)
-    @_connectables = @_connectors.map(&:connectable_with_deleted)
-    unless (logged_in? && current_user.able_to?(:administrate, :edit_content, :publish_content))
-      worst_exception = nil
-      @_connectables.each do |c|
-        begin
-          c.prepare_to_render(self) 
-        rescue
-          logger.debug "THROWN EXCEPTION by connectable #{c}: #{$!}"
-          case $!
-          when ActiveRecord::RecordNotFound
-            raise
-          when Cms::Errors::AccessDenied
-            worst_exception = $!
-          else
-            c.render_exception = $!
-          end
-        end
-      end
-      raise worst_exception if worst_exception
-    end 
-  end 
-
   # ----- Before Filters -------------------------------------------------------
   def construct_path
     @paths = params[:page_path] || params[:path] || []
     @path = "/#{@paths.join("/")}"
   end