Use CSS rather than HTML attributes for styling.

[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..2284174be1e639aac5fabce5881e2bfdda9950a8 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -4,7 +4,7 @@ class UserBlocksController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:new, :create, :edit, :update, :revoke]
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:new, :create, :edit, :update, :revoke]

-  before_filter :require_moderator, :only => [:create, :update, :revoke]
+  before_filter :require_moderator, :only => [:new, :create, :edit, :update, :revoke]

   before_filter :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by]
   before_filter :lookup_user_block, :only => [:show, :edit, :update, :revoke]
   before_filter :require_valid_params, :only => [:create, :update]
   before_filter :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by]
   before_filter :lookup_user_block, :only => [:show, :edit, :update, :revoke]
   before_filter :require_valid_params, :only => [:create, :update]


@@ -34,44 +34,43 @@ class UserBlocksController < ApplicationController
   end
 
   def create
   end
 
   def create

-    unless @valid_params 
-      redirect_to :action => "new"
-      return
-    end
-
-    @user_block = UserBlock.new(:user_id => @this_user.id,
-                                :creator_id => @user.id,
-                                :reason => params[:user_block][:reason],
-                                :ends_at => Time.now.getutc() + @block_period.hours,
-                                :needs_view => params[:user_block][:needs_view])
+    if @valid_params 
+      @user_block = UserBlock.new(
+        :user_id => @this_user.id,
+        :creator_id => @user.id,
+        :reason => params[:user_block][:reason],
+        :ends_at => Time.now.getutc() + @block_period.hours,
+        :needs_view => params[:user_block][:needs_view]
+      )

     
     

-    if @user_block.save
-      flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name)
-      redirect_to @user_block
+      if @user_block.save
+        flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name)
+        redirect_to @user_block
+      else
+        render :action => "new"
+      end

     else
     else

-      render :action => "new"
+      redirect_to new_user_block_path(:display_name => params[:display_name])

     end
   end
 
   def update  
     end
   end
 
   def update  

-    unless @valid_params 
-      redirect_to :action => "edit"
-      return
-    end
-
-    if @user_block.creator_id != @user.id
-      flash[:notice] = t('user_block.update.only_creator_can_edit')
-      redirect_to :action => "edit"
-      return
-    end
-      
-    if @user_block.update_attributes({ :ends_at => Time.now.getutc() + @block_period.hours,
-                                       :reason => params[:user_block][:reason],
-                                       :needs_view => params[:user_block][:needs_view] })
-      flash[:notice] = t('user_block.update.success')
-      redirect_to(@user_block)
+    if @valid_params 
+      if @user_block.creator_id != @user.id
+        flash[:error] = t('user_block.update.only_creator_can_edit')
+        redirect_to :action => "edit"
+      elsif @user_block.update_attributes(
+              :ends_at => Time.now.getutc() + @block_period.hours,
+              :reason => params[:user_block][:reason],
+              :needs_view => params[:user_block][:needs_view]
+            )
+        flash[:notice] = t('user_block.update.success')
+        redirect_to(@user_block)
+      else
+        render :action => "edit"
+      end

     else
     else

-      render :action => "edit"
+      redirect_to edit_user_block_path(:id => params[:id])

     end
   end
 
     end
   end
 


@@ -107,24 +106,6 @@ class UserBlocksController < ApplicationController
   end
 
   private
   end
 
   private

-  ##
-  # require that the user is a moderator, or fill out a helpful error message
-  # and return them to the blocks index.
-  def require_moderator
-    unless @user.moderator?
-      flash[:notice] = t('user_block.filter.not_a_moderator')
-      redirect_to :action => 'index'
-    end
-  end
-
-  ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    @this_user = User.find_by_display_name(params[:display_name])
-  rescue ActiveRecord::RecordNotFound
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
-  end
-

   ##
   # ensure that there is a "user_block" instance variable
   def lookup_user_block
   ##
   # ensure that there is a "user_block" instance variable
   def lookup_user_block


@@ -143,10 +124,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