X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1be7bb8a047ccad1cd49a5e6e623f6a12d42b918..3d874a5d61b332cefe944b77cfa38a1061425d3f:/app/controllers/diary_entry_controller.rb?ds=sidebyside diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 388df43fe..68d3a81ee 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -3,24 +3,40 @@ class DiaryEntryController < ApplicationController before_filter :authorize_web before_filter :set_locale - before_filter :require_user, :only => [:new, :edit] + 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] + + caches_action :list, :layout => false, :unless => :user_specific_list? + caches_action :rss, :layout => true + caches_action :view, :layout => false + cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment] def new @title = t 'diary_entry.new.title' - if params[:diary_entry] + if params[:diary_entry] @diary_entry = DiaryEntry.new(params[:diary_entry]) @diary_entry.user = @user - if @diary_entry.save + if @diary_entry.save + default_lang = @user.preferences.where(:k => "diary.default_language").first + if default_lang + default_lang.v = @diary_entry.language_code + default_lang.save! + 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 else render :action => 'edit' end else - @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language) + 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) render :action => 'edit' end end @@ -32,8 +48,6 @@ class DiaryEntryController < ApplicationController if @user != @diary_entry.user redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] elsif params[:diary_entry] - params[:diary_entry][:language] = Language.find_by_code(params[:diary_entry][:language]) - params[:diary_entry][:language] = Language.find_by_code("en") if params[:diary_entry][:language].nil? if @diary_entry.update_attributes(params[:diary_entry]) redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] end @@ -44,10 +58,13 @@ class DiaryEntryController < ApplicationController def comment @entry = DiaryEntry.find(params[:id]) - @diary_comment = @entry.diary_comments.build(params[:diary_comment]) + @diary_comment = @entry.comments.build(params[:diary_comment]) @diary_comment.user = @user if @diary_comment.save - Notifier::deliver_diary_comment_notification(@diary_comment) + if @diary_comment.user != @entry.user + Notifier.diary_comment_notification(@diary_comment).deliver + end + redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id else render :action => 'view' @@ -56,77 +73,143 @@ class DiaryEntryController < ApplicationController def list if params[:display_name] - @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true}) + @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 @entry_pages, @entries = paginate(:diary_entries, - :conditions => ['user_id = ?', @this_user.id], + :conditions => { + :user_id => @this_user.id, + :visible => true + }, :order => 'created_at DESC', :per_page => 20) else - @not_found_user = params[:display_name] - - render :action => 'no_such_user', :status => :not_found + render_unknown_user params[:display_name] + end + elsif params[:language] + @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name + @entry_pages, @entries = paginate(:diary_entries, :include => :user, + :conditions => { + :users => { :status => ["active", "confirmed"] }, + :visible => true, + :language_code => params[:language] + }, + :order => 'created_at DESC', + :per_page => 20) + elsif params[:friends] + if @user + @title = t 'diary_entry.list.title_friends' + @entry_pages, @entries = paginate(:diary_entries, :include => :user, + :conditions => { + :user_id => @user.friend_users, + :visible => true + }, + :order => 'created_at DESC', + :per_page => 20) + else + require_user + return end + elsif params[:nearby] + if @user + @title = t 'diary_entry.list.title_nearby' + @entry_pages, @entries = paginate(:diary_entries, :include => :user, + :conditions => { + :user_id => @user.nearby, + :visible => true + }, + :order => 'created_at DESC', + :per_page => 20) + else + require_user + return + end else @title = t 'diary_entry.list.title' @entry_pages, @entries = paginate(:diary_entries, :include => :user, - :conditions => ["users.visible = ?", true], + :conditions => { + :users => { :status => ["active", "confirmed"] }, + :visible => true + }, :order => 'created_at DESC', :per_page => 20) end end def rss + @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20) + if params[:display_name] - user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true}) + user = User.active.find_by_display_name(params[:display_name]) if user - @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20) - @title = "OpenStreetMap diary entries for #{user.display_name}" - @description = "Recent OpenStreetmap diary entries from #{user.display_name}" + @entries = user.diary_entries.visible + @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name) + @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name) @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" - - render :content_type => Mime::RSS else render :nothing => true, :status => :not_found end elsif params[:language] - @entries = DiaryEntry.find(:all, :include => :user, - :conditions => ["users.visible = ? AND diary_entries.language = ?", true, params[:language]], - :order => 'created_at DESC', :limit => 20) - @title = "OpenStreetMap diary entries in #{params[:language]}" - @description = "Recent diary entries from users of OpenStreetMap" + @entries = @entries.visible.where(:language_code => params[:language]).joins(:user).where(:users => { :status => ["active", "confirmed"] }) + @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name) + @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name) @link = "http://#{SERVER_URL}/diary/#{params[:language]}" - - render :content_type => Mime::RSS else - @entries = DiaryEntry.find(:all, :include => :user, - :conditions => ["users.visible = ?", true], - :order => 'created_at DESC', :limit => 20) - @title = "OpenStreetMap diary entries" - @description = "Recent diary entries from users of OpenStreetMap" + @entries = @entries.visible.joins(:user).where(:users => { :status => ["active", "confirmed"] }) + @title = I18n.t('diary_entry.feed.all.title') + @description = I18n.t('diary_entry.feed.all.description') @link = "http://#{SERVER_URL}/diary" - - render :content_type => Mime::RSS end end def view - user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true}) - - if user - @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]]) - if @entry - @title = t 'diary_entry.view.title', :user => params[:display_name] - else - render :action => 'no_such_entry', :status => :not_found - end + @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 else - @not_found_user = params[:display_name] + @title = t 'diary_entry.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_attributes({:visible => false}, :without_protection => true) + redirect_to :action => "list", :display_name => entry.user.display_name + end - render :action => 'no_such_user', :status => :not_found + def hidecomment + comment = DiaryComment.find(params[:comment]) + comment.update_attributes({:visible => false}, :without_protection => true) + redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id + end + + def comments + @comment_pages, @comments = paginate(:diary_comments, + :conditions => { + :user_id => @this_user, + :visible => true + }, + :order => 'created_at DESC', + :per_page => 20) + @page = (params[:page] || 1).to_i + end +private + ## + # require that the user is a administrator, or fill out a helpful error message + # and return them to the user page. + def require_administrator + unless @user.administrator? + flash[:error] = t('user.filter.not_an_administrator') + redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id] end end + + ## + # is this list user specific? + def user_specific_list? + params[:friends] or params[:nearby] + end end