beef-slides 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/app/controllers/admin/slide_shows_controller.rb

@@ -72,12 +72,17 @@ class Admin::SlideShowsController < Admin::BaseController
   # DELETE /slide_shows/1.xml
   def destroy
     @slide_show = SlideShow.find(params[:id])
-    @slide_show.destroy
-    flash[:notice] = 'SlideShow was successfully deleted.'
-
-    respond_to do |format|
-      format.html { redirect_to(admin_slide_shows_url) }
-      format.xml  { head :ok }
+    if @slide_show.lock_level >0
+      flash[:notice] = 'This Slide Show is locked.'
+      redirect_to(:back)
+    else
+      @slide_show.destroy
+      flash[:notice] = 'SlideShow was successfully deleted.'
+  
+      respond_to do |format|
+        format.html { redirect_to(admin_slide_shows_url) }
+        format.xml  { head :ok }
+      end
     end
   end
 end

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

@@ -16,6 +16,14 @@
     <%= f.label :link %><br />
     <%= f.text_field :link %>
   </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.textarea :body %>
+  </p>
+
+
+
+
   <p>
     <%= f.label :uploaded_data, "Image" %><br />
     <%= f.file_field :uploaded_data %>

data/generators/slides_migration/templates/migration.rb

@@ -3,6 +3,7 @@ class CreateSlides < ActiveRecord::Migration
     create_table :slides do |t|
       t.string :title
       t.string :strapline
+      t.text :body
       t.string :link
       t.integer :position, :default => 0
       t.datetime :published_at

data/slides.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slides}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Craig"]
-  s.date = %q{2009-09-04}
+  s.date = %q{2009-09-07}
   s.email = %q{daniel@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-slides
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel Craig
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: []