Remove unused map link locale strings

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

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index a1cd6ab0ed2d9023a4f3a0e4f0da64ea4cd95d8f..f3fbcd1fd0193aed5b70015f24490e0b2a7176bd 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -1,5 +1,6 @@
 class DiaryEntriesController < ApplicationController
   include UserMethods
 class DiaryEntriesController < ApplicationController
   include UserMethods

+  include PaginationMethods

 
   layout "site", :except => :rss
 
 
   layout "site", :except => :rss
 


@@ -11,7 +12,8 @@ class DiaryEntriesController < ApplicationController
 
   before_action :lookup_user, :only => [:show, :comments]
   before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
 
   before_action :lookup_user, :only => [:show, :comments]
   before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]

-  before_action :allow_thirdparty_images, :only => [:new, :create, :edit, :update, :index, :show, :comments]
+
+  allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show, :comments]

 
   def index
     if params[:display_name]
 
   def index
     if params[:display_name]


@@ -47,6 +49,8 @@ class DiaryEntriesController < ApplicationController
         @title = t ".in_language_title", :language => Language.find(params[:language]).english_name
         entries = entries.where(:language_code => params[:language])
       else
         @title = t ".in_language_title", :language => Language.find(params[:language]).english_name
         entries = entries.where(:language_code => params[:language])
       else

+        candidate_codes = preferred_languages.flat_map(&:candidates).uniq.map(&:to_s)
+        @languages = Language.where(:code => candidate_codes).in_order_of(:code, candidate_codes)

         @title = t ".title"
       end
     end
         @title = t ".title"
       end
     end


@@ -55,15 +59,16 @@ class DiaryEntriesController < ApplicationController
 
     @params = params.permit(:display_name, :friends, :nearby, :language)
 
 
     @params = params.permit(:display_name, :friends, :nearby, :language)
 

-    @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, [:user, :language])
+    @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language])

   end
 
   def show
     entries = @user.diary_entries
     entries = entries.visible unless can? :unhide, DiaryEntry
   end
 
   def show
     entries = @user.diary_entries
     entries = entries.visible unless can? :unhide, DiaryEntry

-    @entry = entries.where(:id => params[:id]).first
+    @entry = entries.find_by(:id => params[:id])

     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title

+      @og_image = @entry.body.image

       @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
     else
       @title = t "diary_entries.no_such_entry.title", :id => params[:id]
       @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
     else
       @title = t "diary_entries.no_such_entry.title", :id => params[:id]


@@ -74,7 +79,7 @@ class DiaryEntriesController < ApplicationController
   def new
     @title = t ".title"
 
   def new
     @title = t ".title"
 

-    default_lang = current_user.preferences.where(:k => "diary.default_language").first
+    default_lang = current_user.preferences.find_by(:k => "diary.default_language")

     lang_code = default_lang ? default_lang.v : current_user.preferred_language
     @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
     set_map_location
     lang_code = default_lang ? default_lang.v : current_user.preferred_language
     @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
     set_map_location


@@ -99,7 +104,7 @@ class DiaryEntriesController < ApplicationController
     @diary_entry.user = current_user
 
     if @diary_entry.save
     @diary_entry.user = current_user
 
     if @diary_entry.save

-      default_lang = current_user.preferences.where(:k => "diary.default_language").first
+      default_lang = current_user.preferences.find_by(:k => "diary.default_language")

       if default_lang
         default_lang.v = @diary_entry.language_code
         default_lang.save!
       if default_lang
         default_lang.v = @diary_entry.language_code
         default_lang.save!


@@ -155,21 +160,25 @@ class DiaryEntriesController < ApplicationController
   end
 
   def subscribe
   end
 
   def subscribe

-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])

 
 

-    diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
+    if request.post?
+      @diary_entry.subscriptions.create(:user => current_user) unless @diary_entry.subscribers.exists?(current_user.id)

 
 

-    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe

-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])

 
 

-    diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
+    if request.post?
+      @diary_entry.subscriptions.where(:user => current_user).delete_all if @diary_entry.subscribers.exists?(current_user.id)

 
 

-    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end


@@ -235,12 +244,12 @@ class DiaryEntriesController < ApplicationController
   def comments
     @title = t ".title", :user => @user.display_name
 
   def comments
     @title = t ".title", :user => @user.display_name
 

-    comments = DiaryComment.where(:users => @user)
+    comments = DiaryComment.where(:user => @user)

     comments = comments.visible unless can? :unhidecomment, DiaryEntry
 
     @params = params.permit(:display_name, :before, :after)
 
     comments = comments.visible unless can? :unhidecomment, DiaryEntry
 
     @params = params.permit(:display_name, :before, :after)
 

-    @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, [:user])
+    @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])

   end
 
   private
   end
 
   private


@@ -276,24 +285,4 @@ class DiaryEntriesController < ApplicationController
       @zoom = 12
     end
   end
       @zoom = 12
     end
   end

-
-  def get_page_items(items, includes)
-    id_column = "#{items.table_name}.id"
-    page_items = if params[:before]
-                   items.where("#{id_column} < ?", params[:before]).order(:id => :desc)
-                 elsif params[:after]
-                   items.where("#{id_column} > ?", params[:after]).order(:id => :asc)
-                 else
-                   items.order(:id => :desc)
-                 end
-
-    page_items = page_items.limit(20)
-    page_items = page_items.includes(includes)
-    page_items = page_items.sort.reverse
-
-    newer_items_id = page_items.first.id if page_items.count.positive? && items.exists?(["#{id_column} > ?", page_items.first.id])
-    older_items_id = page_items.last.id if page_items.count.positive? && items.exists?(["#{id_column} < ?", page_items.last.id])
-
-    [page_items, newer_items_id, older_items_id]
-  end

 end
 end