beef-slides 1.1.10 → 1.1.11

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/app/controllers/slides_controller.rb

@@ -1,8 +1,15 @@
 class SlidesController < ApplicationController
 
   def index
+    if params[:slide_show_id].blank?
+      @slides = Slide.published
+    else
+      @slideshow = SlideShow.find_by_permalink(params[:slide_show_id])
+      @slides = @slideshow.slides.published
+    end
+    
     respond_to do |format|
-      format.json  { render :json => Slide.published }
+      format.json  { render :json => @slides }
     end
   end
 

data/app/views/admin/slides/index.html.erb

@@ -23,7 +23,7 @@
 <% @slides.each do |slide| %>
     <tr>
       <td><%= slide.position %></td>
-      <td><%= image_tag slide.public_filename, :width => 100 unless slide.filename == 'no_file' %></td>
+      <td><%= image_tag slide.public_filename(:slide), :width => 100 unless slide.filename == 'no_file' %></td>
       <td><%=h slide.title %></td>
       <td><%= content_status(slide) %></td>
       <td><%=h slide.created_at.to_formatted_s(:short) %></td>

data/beef-slides.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-slides}
-  s.version = "1.1.10"
+  s.version = "1.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Craig"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-02-24}
   s.email = %q{daniel@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -49,8 +49,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Slide show generation}
   s.test_files = [
-    "test/slide_show_test.rb",
-     "test/slides_test.rb",
+    "test/slides_test.rb",
+     "test/slide_show_test.rb",
      "test/test_helper.rb"
   ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-slides
 version: !ruby/object:Gem::Version 
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors: 
 - Daniel Craig
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 +00:00
+date: 2010-02-24 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,6 @@ signing_key:
 specification_version: 3
 summary: Slide show generation
 test_files: 
-- test/slide_show_test.rb
 - test/slides_test.rb
+- test/slide_show_test.rb
 - test/test_helper.rb