Set the reported_user in a callback

[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 bf9f2a9a24975ffaad3f40e6a9da1a880f40d940..89107ab1ac2f1c22f01398bd67086afbc6f2b62a 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -12,7 +12,7 @@ class DiaryEntryController < ApplicationController
   def new
     @title = t "diary_entry.new.title"
 
   def new
     @title = t "diary_entry.new.title"
 

-    if params[:diary_entry]
+    if request.post?

       @diary_entry = DiaryEntry.new(entry_params)
       @diary_entry.user = @user
 
       @diary_entry = DiaryEntry.new(entry_params)
       @diary_entry.user = @user
 


@@ -35,7 +35,7 @@ class DiaryEntryController < ApplicationController
     else
       default_lang = @user.preferences.where(:k => "diary.default_language").first
       lang_code = default_lang ? default_lang.v : @user.preferred_language
     else
       default_lang = @user.preferences.where(:k => "diary.default_language").first
       lang_code = default_lang ? default_lang.v : @user.preferred_language

-      @diary_entry = DiaryEntry.new(:language_code => lang_code)
+      @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))

       set_map_location
       render :action => "edit"
     end
       set_map_location
       render :action => "edit"
     end


@@ -102,7 +102,7 @@ class DiaryEntryController < ApplicationController
 
   def list
     if params[:display_name]
 
   def list
     if params[:display_name]

-      @this_user = User.active.find_by_display_name(params[:display_name])
+      @this_user = User.active.find_by(:display_name => params[:display_name])

 
       if @this_user
         @title = t "diary_entry.list.user_title", :user => @this_user.display_name
 
       if @this_user
         @title = t "diary_entry.list.user_title", :user => @this_user.display_name


@@ -128,7 +128,7 @@ class DiaryEntryController < ApplicationController
         return
       end
     else
         return
       end
     else

-      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w(active confirmed) })
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })

 
       if params[:language]
         @title = t "diary_entry.list.in_language_title", :language => Language.find(params[:language]).english_name
 
       if params[:language]
         @title = t "diary_entry.list.in_language_title", :language => Language.find(params[:language]).english_name


@@ -138,6 +138,8 @@ class DiaryEntryController < ApplicationController
       end
     end
 
       end
     end
 

+    @params = params.permit(:display_name, :friends, :nearby, :language)
+

     @page = (params[:page] || 1).to_i
     @page_size = 20
 
     @page = (params[:page] || 1).to_i
     @page_size = 20
 


@@ -150,7 +152,7 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
 
   def rss
     if params[:display_name]

-      user = User.active.find_by_display_name(params[:display_name])
+      user = User.active.find_by(:display_name => params[:display_name])

 
       if user
         @entries = user.diary_entries
 
       if user
         @entries = user.diary_entries


@@ -158,11 +160,11 @@ class DiaryEntryController < ApplicationController
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else

-        render :text => "", :status => :not_found
+        head :not_found

         return
       end
     else
         return
       end
     else

-      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w(active confirmed) })
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })

 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])
 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])


@@ -183,6 +185,9 @@ class DiaryEntryController < ApplicationController
     @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
     if @entry
       @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title
     @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
     if @entry
       @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title

+      if params[:comment_id]
+        @reported_comment = DiaryComment.where(:id => params[:comment_id])
+      end

     else
       @title = t "diary_entry.no_such_entry.title", :id => params[:id]
       render :action => "no_such_entry", :status => :not_found
     else
       @title = t "diary_entry.no_such_entry.title", :id => params[:id]
       render :action => "no_such_entry", :status => :not_found


@@ -218,6 +223,8 @@ class DiaryEntryController < ApplicationController
   # return permitted diary entry parameters
   def entry_params
     params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)
   # return permitted diary entry parameters
   def entry_params
     params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)

+  rescue ActionController::ParameterMissing
+    ActionController::Parameters.new.permit(:title, :body, :language_code, :latitude, :longitude)

   end
 
   ##
   end
 
   ##