Remove reference to standard layer in "no key" message

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

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 7c38e58a8a57eff382e43f6be231b66750a86ec0..38436236486ba2d75f7f792bc8ad5af44eeae20c 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,13 +1,13 @@
 class DiaryEntryController < ApplicationController
   layout "site", :except => :rss
 
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment]
-  before_filter :lookup_this_user, :only => [:view, :comments]
-  before_filter :check_database_readable
-  before_filter :check_database_writable, :only => [:new, :edit]
-  before_filter :require_administrator, :only => [:hide, :hidecomment]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment]
+  before_action :lookup_this_user, :only => [:view, :comments]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:new, :edit]
+  before_action :require_administrator, :only => [:hide, :hidecomment]
 
   def new
     @title = t "diary_entry.new.title"
@@ -24,7 +24,7 @@ class DiaryEntryController < ApplicationController
         else
           @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
         end
-        redirect_to :controller => "diary_entry", :action => "list", :display_name => @user.display_name
+        redirect_to :action => "list", :display_name => @user.display_name
       else
         render :action => "edit"
       end
@@ -42,9 +42,9 @@ class DiaryEntryController < ApplicationController
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user
-      redirect_to :controller => "diary_entry", :action => "view", :id => params[:id]
+      redirect_to :action => "view", :id => params[:id]
     elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
-      redirect_to :controller => "diary_entry", :action => "view", :id => params[:id]
+      redirect_to :action => "view", :id => params[:id]
     end
 
     set_map_location
@@ -61,7 +61,7 @@ class DiaryEntryController < ApplicationController
         Notifier.diary_comment_notification(@diary_comment).deliver_now
       end
 
-      redirect_to :controller => "diary_entry", :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
+      redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
     else
       render :action => "view"
     end
@@ -201,16 +201,10 @@ class DiaryEntryController < ApplicationController
   def require_administrator
     unless @user.administrator?
       flash[:error] = t("user.filter.not_an_administrator")
-      redirect_to :controller => "diary_entry", :action => "view"
+      redirect_to :action => "view"
     end
   end
 
-  ##
-  # is this list user specific?
-  def user_specific_list?
-    params[:friends] || params[:nearby]
-  end
-
   ##
   # decide on a location for the diary entry map
   def set_map_location