Merge branch 'master' into notes

[rails.git] / app / controllers / redactions_controller.rb

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index a70ada3ecddf7ba3c5693c4f475957b15571cb0c..f8713608d70c148a23b7dd1e37c688caa42a409d 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -22,9 +22,7 @@ class RedactionsController < ApplicationController
     @redaction.user = @user
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
     @redaction.user = @user
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]

-    # didn't see this come in from the form - maybe i'm doing something
-    # wrong, or markdown is the only thing supported at the moment?
-    @redaction.description_format = 'markdown'
+    # note that the description format will default to 'markdown'

 
     if @redaction.save
       flash[:notice] = t('redaction.create.flash')
 
     if @redaction.save
       flash[:notice] = t('redaction.create.flash')


@@ -42,14 +40,8 @@ class RedactionsController < ApplicationController
      
   def update
     # note - don't update the user ID
      
   def update
     # note - don't update the user ID

-    
-    if params[:redaction][:title] and params[:redaction][:title] != @redaction.title
-      @redaction.title = params[:redaction][:title]
-    end
-
-    if params[:redaction][:description] and params[:redaction][:description] != @redaction.description
-      @redaction.description = params[:redaction][:description]
-    end
+    @redaction.title = params[:redaction][:title]
+    @redaction.description = params[:redaction][:description]

 
     if @redaction.save
       flash[:notice] = t('redaction.update.flash')
 
     if @redaction.save
       flash[:notice] = t('redaction.update.flash')


@@ -68,7 +60,7 @@ class RedactionsController < ApplicationController
     else
       if @redaction.destroy
         flash[:notice] = t('redaction.destroy.flash')
     else
       if @redaction.destroy
         flash[:notice] = t('redaction.destroy.flash')

-        redirect_to :index
+        redirect_to :redactions

       else
         flash[:error] = t('redaction.destroy.error')
         redirect_to @redaction
       else
         flash[:error] = t('redaction.destroy.error')
         redirect_to @redaction