beef-pages 0.3.14 → 0.3.15

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/app/controllers/pages_controller.rb

@@ -3,6 +3,8 @@ class PagesController < ApplicationController
 
   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
@@ -13,8 +15,12 @@ class PagesController < ApplicationController
   
   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)}"

data/beef-pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-pages}
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-19}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/generators/page_template/templates/default.html.erb

@@ -8,14 +8,14 @@
   <%= @page.body %>
   
   <h3 class="hidden">Document Download</h3>
-  <%= documents @page.assets %>
+  <%= documents @documents %>
 
-  <% if @page.assets.images.empty? %>
+  <% if @images.empty? %>
   <% else -%>
     <h3 class="hidden">Gallery</h3>
     <div id="gallery">
       <div class="image-gallery">
-        <%= gallery @page.assets %>
+        <%= gallery @images %>
       </div>
     </div>
   <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +00:00
+date: 2010-02-19 00:00:00 +00:00
 default_executable: 
 dependencies: []