X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9174049d6b4e50c32ba1a11b1c628bcfe32c06bf..8ba1ea0f5d069fe8f2c96fff0804de4fd794bd1e:/app/controllers/diary_entries_controller.rb?ds=sidebyside diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index 6981ed797..bf6e8d0b1 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -1,4 +1,7 @@ class DiaryEntriesController < ApplicationController + include UserMethods + include PaginationMethods + layout "site", :except => :rss before_action :authorize_web @@ -7,9 +10,10 @@ class DiaryEntriesController < ApplicationController authorize_resource - 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] + before_action :lookup_user, :only => :show + before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :unhide, :subscribe, :unsubscribe] + + allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show] def index if params[:display_name] @@ -25,7 +29,7 @@ class DiaryEntriesController < ApplicationController elsif params[:friends] if current_user @title = t ".title_friends" - entries = DiaryEntry.where(:user_id => current_user.friends) + entries = DiaryEntry.where(:user => current_user.friends) else require_user return @@ -33,7 +37,7 @@ class DiaryEntriesController < ApplicationController elsif params[:nearby] if current_user @title = t ".title_nearby" - entries = DiaryEntry.where(:user_id => current_user.nearby) + entries = DiaryEntry.where(:user => current_user.nearby) else require_user return @@ -45,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 + 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 @@ -53,29 +59,17 @@ class DiaryEntriesController < ApplicationController @params = params.permit(:display_name, :friends, :nearby, :language) - @entries = if params[:before] - entries.where("diary_entries.id < ?", params[:before]).order(:id => :desc) - elsif params[:after] - entries.where("diary_entries.id > ?", params[:after]).order(:id => :asc) - else - entries.order(:id => :desc) - end - - @entries = @entries.limit(20) - @entries = @entries.includes(:user, :language) - @entries = @entries.sort.reverse - - @newer_entries = @entries.count.positive? && entries.exists?(["diary_entries.id > ?", @entries.first.id]) - @older_entries = @entries.count.positive? && entries.exists?(["diary_entries.id < ?", @entries.last.id]) + @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 - @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 - @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments + @og_image = @entry.body.image + @comments = can?(:unhide, DiaryComment) ? @entry.comments : @entry.visible_comments else @title = t "diary_entries.no_such_entry.title", :id => params[:id] render :action => "no_such_entry", :status => :not_found @@ -85,7 +79,7 @@ class DiaryEntriesController < ApplicationController 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 @@ -110,7 +104,7 @@ class DiaryEntriesController < ApplicationController @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! @@ -166,21 +160,25 @@ class DiaryEntriesController < ApplicationController 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 - 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 @@ -231,32 +229,6 @@ class DiaryEntriesController < ApplicationController redirect_to :action => "index", :display_name => entry.user.display_name end - def hidecomment - comment = DiaryComment.find(params[:comment]) - comment.update(:visible => false) - redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry) - end - - def unhidecomment - comment = DiaryComment.find(params[:comment]) - comment.update(:visible => true) - redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry) - end - - def comments - @title = t ".title", :user => @user.display_name - - conditions = { :user_id => @user } - - conditions[:visible] = true unless can? :unhidecomment, DiaryEntry - - @comment_pages, @comments = paginate(:diary_comments, - :conditions => conditions, - :order => "created_at DESC", - :per_page => 20) - @page = (params[:page] || 1).to_i - end - private ##