Add an explicit "default editor" option to the user settings

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

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index fd9f03c4a9c4315d614dbd1a0855fa1576bd4a4b..75c9df9dc90be24f13f1ebee83f895bd94d80e4f 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -60,7 +60,7 @@ class UserBlocksController < ApplicationController
     end
 
     if @user_block.creator_id != @user.id
     end
 
     if @user_block.creator_id != @user.id

-      flash[:notice] = t('user_block.update.only_creator_can_edit')
+      flash[:error] = t('user_block.update.only_creator_can_edit')

       redirect_to :action => "edit"
       return
     end
       redirect_to :action => "edit"
       return
     end


@@ -112,7 +112,7 @@ class UserBlocksController < ApplicationController
   # and return them to the blocks index.
   def require_moderator
     unless @user.moderator?
   # and return them to the blocks index.
   def require_moderator
     unless @user.moderator?

-      flash[:notice] = t('user_block.filter.not_a_moderator')
+      flash[:error] = t('user_block.filter.not_a_moderator')

       redirect_to :action => 'index'
     end
   end
       redirect_to :action => 'index'
     end
   end


@@ -143,10 +143,10 @@ class UserBlocksController < ApplicationController
     @valid_params = false
 
     if !UserBlock::PERIODS.include?(@block_period)
     @valid_params = false
 
     if !UserBlock::PERIODS.include?(@block_period)

-      flash[:notice] = t('user_block.filter.block_period')
+      flash[:error] = t('user_block.filter.block_period')

       
     elsif @user_block and !@user_block.active?
       
     elsif @user_block and !@user_block.active?

-      flash[:notice] = t('user_block.filter.block_expired')
+      flash[:error] = t('user_block.filter.block_expired')

       
     else
       @valid_params = true
       
     else
       @valid_params = true