pages_controller.rb in radiant-0.8.0

- old
+ new

@@ -1,10 +1,10 @@
 class Admin::PagesController < Admin::ResourceController
   before_filter :initialize_meta_rows_and_buttons, :only => [:new, :edit, :create, :update]
-
+  before_filter :count_deleted_pages, :only => [:destroy]
+  
   responses do |r|
-    r.plural.html { render }
     r.plural.js do
       @level = params[:level].to_i
       @template_name = 'index'
       response.headers['Content-Type'] = 'text/html;charset=utf-8'
       render :action => 'children.html.haml', :layout => false
@@ -13,19 +13,23 @@
   
   def index
     @homepage = Page.find_by_parent_id(nil)
     response_for :plural
   end
+  
+  def show
+    redirect_to edit_admin_page_path(params[:id])
+  end
 
   def new
     self.model = model_class.new_with_defaults(config)
     if params[:page_id].blank?
       self.model.slug = '/'
     end
     response_for :singular
   end
-
+  
   private
     def model_class
       if params[:page_id]
         Page.find(params[:page_id]).children
       else
@@ -35,15 +39,19 @@
 
     def announce_saved(message = nil)
       flash[:notice] = message || "Your page has been saved below."
     end
 
-    def announce_pages_removed(count)
-      flash[:notice] = if count > 1
+    def announce_removed
+      flash[:notice] = if @count > 0
         "The pages were successfully removed from the site."
       else
         "The page was successfully removed from the site."
       end
+    end
+
+    def count_deleted_pages
+      @count = model.children.count + 1
     end
 
     def initialize_meta_rows_and_buttons
       @buttons_partials ||= []
       @meta ||= []