X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..1253bdcdc5dc43dc3880751a7255256c292e0ddc:/app/controllers/diary_entries_controller.rb diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index 5f53e81b6..ea6d1d276 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -1,4 +1,6 @@ class DiaryEntriesController < ApplicationController + include UserMethods + layout "site", :except => :rss before_action :authorize_web @@ -11,8 +13,79 @@ class DiaryEntriesController < ApplicationController 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] + def index + if params[:display_name] + @user = User.active.find_by(:display_name => params[:display_name]) + + if @user + @title = t ".user_title", :user => @user.display_name + entries = @user.diary_entries + else + render_unknown_user params[:display_name] + return + end + elsif params[:friends] + if current_user + @title = t ".title_friends" + entries = DiaryEntry.where(:user_id => current_user.friends) + else + require_user + return + end + elsif params[:nearby] + if current_user + @title = t ".title_nearby" + entries = DiaryEntry.where(:user_id => current_user.nearby) + else + require_user + return + end + else + entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] }) + + if params[:language] + @title = t ".in_language_title", :language => Language.find(params[:language]).english_name + entries = entries.where(:language_code => params[:language]) + else + @title = t ".title" + end + end + + entries = entries.visible unless can? :unhide, DiaryEntry + + @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]) + end + + def show + entries = @user.diary_entries + entries = entries.visible unless can? :unhide, DiaryEntry + @entry = entries.where(:id => params[:id]).first + if @entry + @title = t ".title", :user => params[:display_name], :title => @entry.title + @comments = can?(:unhidecomment, DiaryEntry) ? @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 + end + end + def new - @title = t "diary_entries.new.title" + @title = t ".title" default_lang = current_user.preferences.where(:k => "diary.default_language").first lang_code = default_lang ? default_lang.v : current_user.preferred_language @@ -21,6 +94,17 @@ class DiaryEntriesController < ApplicationController render :action => "new" end + def edit + @title = t ".title" + @diary_entry = DiaryEntry.find(params[:id]) + + redirect_to diary_entry_path(@diary_entry.user, @diary_entry) if current_user != @diary_entry.user + + set_map_location + rescue ActiveRecord::RecordNotFound + render :action => "no_such_entry", :status => :not_found + end + def create @title = t "diary_entries.new.title" @@ -45,24 +129,12 @@ class DiaryEntriesController < ApplicationController end end - def edit - @title = t "diary_entries.edit.title" - @diary_entry = DiaryEntry.find(params[:id]) - - redirect_to diary_entry_path(@diary_entry.user, @diary_entry) if current_user != @diary_entry.user - - set_map_location - rescue ActiveRecord::RecordNotFound - render :action => "no_such_entry", :status => :not_found - end - def update @title = t "diary_entries.edit.title" @diary_entry = DiaryEntry.find(params[:id]) - if current_user != @diary_entry.user - redirect_to diary_entry_path(@diary_entry.user, @diary_entry) - elsif params[:diary_entry] && @diary_entry.update(entry_params) + if current_user != @diary_entry.user || + (params[:diary_entry] && @diary_entry.update(entry_params)) redirect_to diary_entry_path(@diary_entry.user, @diary_entry) else set_map_location @@ -81,7 +153,7 @@ class DiaryEntriesController < ApplicationController # Notify current subscribers of the new comment @entry.subscribers.visible.each do |user| - Notifier.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user + UserMailer.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user end # Add the commenter to the subscribers if necessary @@ -115,56 +187,6 @@ class DiaryEntriesController < ApplicationController render :action => "no_such_entry", :status => :not_found end - def index - if params[:display_name] - @user = User.active.find_by(:display_name => params[:display_name]) - - if @user - @title = t "diary_entries.index.user_title", :user => @user.display_name - @entries = @user.diary_entries - else - render_unknown_user params[:display_name] - return - end - elsif params[:friends] - if current_user - @title = t "diary_entries.index.title_friends" - @entries = DiaryEntry.where(:user_id => current_user.friends) - else - require_user - return - end - elsif params[:nearby] - if current_user - @title = t "diary_entries.index.title_nearby" - @entries = DiaryEntry.where(:user_id => current_user.nearby) - else - require_user - return - end - else - @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] }) - - if params[:language] - @title = t "diary_entries.index.in_language_title", :language => Language.find(params[:language]).english_name - @entries = @entries.where(:language_code => params[:language]) - else - @title = t "diary_entries.index.title" - end - end - - @params = params.permit(:display_name, :friends, :nearby, :language) - - @page = (params[:page] || 1).to_i - @page_size = 20 - - @entries = @entries.visible unless can? :unhide, DiaryEntry - @entries = @entries.order("created_at DESC") - @entries = @entries.offset((@page - 1) * @page_size) - @entries = @entries.limit(@page_size) - @entries = @entries.includes(:user, :language) - end - def rss if params[:display_name] user = User.active.find_by(:display_name => params[:display_name]) @@ -199,17 +221,6 @@ class DiaryEntriesController < ApplicationController @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20) end - def show - @entry = @user.diary_entries.visible.where(:id => params[:id]).first - if @entry - @title = t "diary_entries.show.title", :user => params[:display_name], :title => @entry.title - @comments = can?(:unhidecomment, DiaryEntry) ? @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 - end - end - def hide entry = DiaryEntry.find(params[:id]) entry.update(:visible => false) @@ -235,6 +246,8 @@ class DiaryEntriesController < ApplicationController end def comments + @title = t ".title", :user => @user.display_name + conditions = { :user_id => @user } conditions[:visible] = true unless can? :unhidecomment, DiaryEntry @@ -269,7 +282,7 @@ class DiaryEntriesController < ApplicationController @lon = @diary_entry.longitude @lat = @diary_entry.latitude @zoom = 12 - elsif current_user.home_lat.nil? || current_user.home_lon.nil? + elsif !current_user.home_location? @lon = params[:lon] || -0.1 @lat = params[:lat] || 51.5 @zoom = params[:zoom] || 4