beef-slides 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/app/controllers/admin/slides_controller.rb

@@ -4,8 +4,8 @@ class Admin::SlidesController < Admin::BaseController
   # GET /slides
   # GET /slides.xml
   def index
-    @slide_show = SlideShow.find(params[:slide_show_id])
-    @slides = @slide_show.slides.paginate :page => params[:page], :order => sort_order(:default => 'asc')
+    @slide_show = SlideShow.find(params[:slide_show_id]) if params[:slide_show_id]
+    @slides = ( @slide_show ? @slide_show.slides : Slide ).paginate :page => params[:page], :order => sort_order(:default => 'asc')
 
     respond_to do |format|
       format.html # index.html.erb
@@ -44,7 +44,7 @@ class Admin::SlidesController < Admin::BaseController
     respond_to do |format|
       if @slide.save
         flash[:notice] = 'Slide was successfully created.'
-        format.html { redirect_to(admin_slide_show_slides_url(@slide.slide_show)) }
+        format.html { redirect_to( @slide.slide_show ? admin_slide_show_slides_url(@slide.slide_show) : admin_slides_url ) }
         format.xml  { render :xml => @slide, :status => :created, :location => @slide }
       else
         format.html { render :action => "show" }
@@ -61,7 +61,7 @@ class Admin::SlidesController < Admin::BaseController
     respond_to do |format|
       if @slide.update_attributes(params[:slide])
         flash[:notice] = 'Slide was successfully updated.'
-        format.html { redirect_to(admin_slide_show_slides_url(@slide.slide_show)) }
+        format.html { redirect_to( @slide.slide_show ? admin_slide_show_slides_url(@slide.slide_show) : admin_slides_url ) }
         format.xml  { head :ok }
       else
         format.html { render :action => "show" }
@@ -74,11 +74,10 @@ class Admin::SlidesController < Admin::BaseController
   # DELETE /slides/1.xml
   def destroy
     @slide = Slide.find(params[:id])
-    slide_show = @slide.slide_show
     @slide.destroy
 
     respond_to do |format|
-      format.html { redirect_to(admin_slide_show_slides_url(slide_show)) }
+      format.html { redirect_to( @slide.slide_show ? admin_slide_show_slides_url(@slide.slide_show) : admin_slides_url ) }
       format.xml  { head :ok }
     end
   end

data/app/models/slide.rb

@@ -1,6 +1,6 @@
 class Slide < ActiveRecord::Base
   acts_as_publishable
-  acts_as_list :insert_position => :top, :scope => :slide_show_id
+  acts_as_list :scope => :slide_show_id
   has_attachment :storage => :file_system, #Should be changed to S3 for production
                  :path_prefix => 'public/assets/slides', #Should be changed to S3 for production
                  :max_size => 5.megabytes,

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

@@ -1,7 +1,7 @@
-<h1>Listing slides for <%= @slide_show.title %></h1>
+<h1>Listing slides<%= " for #{@slide_show.title}" if @slide_show %></h1>
 
 <ul class="choices">
-  <li><%= link_to 'New slide', new_admin_slide_show_slide_path(@slide_show) %></li>
+  <li><%= link_to 'New slide', @slide_show ? new_admin_slide_show_slide_path(@slide_show) : new_admin_slide_path %></li>
 </ul>  
 
 <table>

data/slides.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slides}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Craig"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-slides
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Daniel Craig