app/controllers/manifest/content_blocks_controller.rb in manifest-rails-0.0.4 vs app/controllers/manifest/content_blocks_controller.rb in manifest-rails-0.1.0

@@ -1,24 +1,20 @@
 class Manifest::ContentBlocksController < Manifest::ManifestController
-  before_filter :authorize
   before_filter :authorize_admin, except: [:index, :edit, :update]
 
-  layout 'manifest/manifest'
-
   def index
     @content_blocks = ContentBlock.all
   end
 
   def new
-    @content_block = ContentBlock.new
+    @content_block = ContentBlock.new(content_block_params)
   end
 
   def create
-    @content_block = ContentBlock.new(params[:content_block])
+    @content_block = ContentBlock.new(content_block_params)
 
     if @content_block.save
-      expire_all_pages
       redirect_to manifest_content_blocks_path
     else
       render 'new'
     end
   end
@@ -28,22 +24,29 @@
   end
 
   def update
     @content_block = ContentBlock.find(params[:id])
 
-    if @content_block.update_attributes(params[:content_block])
-      expire_all_pages
+    if @content_block.update_attributes(content_block_params)
       redirect_to manifest_content_blocks_path
     else
       render 'edit'
     end
   end
 
   def destroy
     @content_block = ContentBlock.find(params[:id])
-    @content_block.delete
+    @content_block.destroy
 
-    expire_all_pages
-
     redirect_to manifest_content_blocks_path
+  end
+
+  private
+
+  def content_block_params
+    if current_editor.admin?
+      params[:content_block]
+    else
+      params[:content_block].slice(:content)
+    end
   end
 end