Fix path for icons in the leaflet images directory

[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 103909e382e01d39de6221824f6157f26b654af9..b0ac27dd4002b53f90cfb42ae4f87fcb1e1abb7b 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -1,5 +1,5 @@
 class UserBlocksController < ApplicationController
 class UserBlocksController < ApplicationController

-  layout 'site'
+  layout "site"

 
   before_filter :authorize_web
   before_filter :set_locale
 
   before_filter :authorize_web
   before_filter :set_locale


@@ -19,7 +19,7 @@ class UserBlocksController < ApplicationController
   end
 
   def show
   end
 
   def show

-    if @user and @user.id == @user_block.user_id
+    if @user && @user.id == @user_block.user_id

       @user_block.needs_view = false
       @user_block.save!
     end
       @user_block.needs_view = false
       @user_block.save!
     end


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

-    if @valid_params 
-      @user_block = UserBlock.new({
+    if @valid_params
+      @user_block = UserBlock.new(

         :user_id => @this_user.id,
         :creator_id => @user.id,
         :reason => params[:user_block][:reason],
         :user_id => @this_user.id,
         :creator_id => @user.id,
         :reason => params[:user_block][:reason],

-        :ends_at => Time.now.getutc() + @block_period.hours,
+        :ends_at => Time.now.getutc + @block_period.hours,

         :needs_view => params[:user_block][:needs_view]
         :needs_view => params[:user_block][:needs_view]

-      }, :without_protection => true)
-    
+      )
+

       if @user_block.save
       if @user_block.save

-        flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name)
+        flash[:notice] = t("user_block.create.flash", :name => @this_user.display_name)

         redirect_to @user_block
       else
         render :action => "new"
         redirect_to @user_block
       else
         render :action => "new"


@@ -54,17 +54,17 @@ class UserBlocksController < ApplicationController
     end
   end
 
     end
   end
 

-  def update  
-    if @valid_params 
+  def update
+    if @valid_params

       if @user_block.creator_id != @user.id
       if @user_block.creator_id != @user.id

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

         redirect_to :action => "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]
-            }, :without_protection => true)
-        flash[:notice] = t('user_block.update.success')
+      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"
         redirect_to(@user_block)
       else
         render :action => "edit"


@@ -79,7 +79,7 @@ class UserBlocksController < ApplicationController
   def revoke
     if params[:confirm]
       if @user_block.revoke! @user
   def revoke
     if params[:confirm]
       if @user_block.revoke! @user

-        flash[:notice] = t'user_block.revoke.flash'
+        flash[:notice] = t "user_block.revoke.flash"

         redirect_to(@user_block)
       end
     end
         redirect_to(@user_block)
       end
     end


@@ -90,7 +90,7 @@ class UserBlocksController < ApplicationController
   def blocks_on
     @user_blocks_pages, @user_blocks = paginate(:user_blocks,
                                                 :include => [:user, :creator, :revoker],
   def blocks_on
     @user_blocks_pages, @user_blocks = paginate(:user_blocks,
                                                 :include => [:user, :creator, :revoker],

-                                                :conditions => {:user_id => @this_user.id},
+                                                :conditions => { :user_id => @this_user.id },

                                                 :order => "user_blocks.ends_at DESC",
                                                 :per_page => 20)
   end
                                                 :order => "user_blocks.ends_at DESC",
                                                 :per_page => 20)
   end


@@ -100,25 +100,12 @@ class UserBlocksController < ApplicationController
   def blocks_by
     @user_blocks_pages, @user_blocks = paginate(:user_blocks,
                                                 :include => [:user, :creator, :revoker],
   def blocks_by
     @user_blocks_pages, @user_blocks = paginate(:user_blocks,
                                                 :include => [:user, :creator, :revoker],

-                                                :conditions => {:creator_id => @this_user.id},
+                                                :conditions => { :creator_id => @this_user.id },

                                                 :order => "user_blocks.ends_at DESC",
                                                 :per_page => 20)
   end
 
   private
                                                 :order => "user_blocks.ends_at DESC",
                                                 :per_page => 20)
   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?
-      if request.get?
-        flash[:error] = t('user_block.filter.not_a_moderator')
-        redirect_to :action => 'index'
-      else
-        render :nothing => true, :status => :forbidden
-      end
-    end
-  end

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


@@ -138,14 +125,13 @@ class UserBlocksController < ApplicationController
     @valid_params = false
 
     if !UserBlock::PERIODS.include?(@block_period)
     @valid_params = false
 
     if !UserBlock::PERIODS.include?(@block_period)

-      flash[:error] = t('user_block.filter.block_period')
-      
-    elsif @user_block and !@user_block.active?
-      flash[:error] = t('user_block.filter.block_expired')
-      
+      flash[:error] = t("user_block.filter.block_period")
+
+    elsif @user_block && !@user_block.active?
+      flash[:error] = t("user_block.filter.block_expired")
+

     else
       @valid_params = true
     end
   end
     else
       @valid_params = true
     end
   end

-

 end
 end