app/controllers/pages_controller.rb in beef-pages-0.3.14 vs app/controllers/pages_controller.rb in beef-pages-0.3.15

- old
+ new

@@ -1,21 +1,27 @@ class PagesController < ApplicationController include Beef::Pages::HelperMethods def show @page = Page.published.find_by_permalink(params[:id]) + @images = @page.assets.images + @documents = @page.assets.documents @page_title = @page.title @page_description = @page.description @page_keywords = @page.tag_list render :template => "pages/templates/#{(@page.template || get_template_names.first)}" end def preview @page = Page.new(session[:page_preview]) + @images = Asset.images.all(:conditions => {:id => session[:page_preview][:asset_ids] }) + @documents = Asset.documents.all(:conditions => {:id => session[:page_preview][:asset_ids] }) + @page.id = 0 @page.published_at = Time.now + @page.published_to = nil @page.created_by = current_user if @page.created_by.nil? session[:page_preview] = nil render :template => "pages/templates/#{(@page.template || get_template_names.first)}" end