X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88a206b0f2979caf066a3127afd3cd71b39da7c8..a21824f754ddea0e45beb87cdaa371e74359e2e2:/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 afa2722a1..a3b37b931 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -1,20 +1,72 @@ class DiaryEntryController < ApplicationController - layout 'site' - - before_filter :authorize_web, :only => [:new] + layout 'site', :except => :rss + + before_filter :authorize_web before_filter :require_user, :only => [:new] def new + @title = 'new diary entry' if params[:diary_entry] - @entry = DiaryEntry.new(@params[:diary_entry]) - @entry.user = @user - if @entry.save - redirect_to :controller => 'user', :action => 'diary', :display_name => @user.display_name + @diary_entry = DiaryEntry.new(params[:diary_entry]) + @diary_entry.user = @user + if @diary_entry.save + redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name end end end + + def comment + @entry = DiaryEntry.find(params[:id]) + @diary_comment = @entry.diary_comments.build(params[:diary_comment]) + @diary_comment.user = @user + if @diary_comment.save + Notifier::deliver_diary_comment_notification(@diary_comment) + redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id + else + render :action => 'view' + end + end def list - @entries=DiaryEntry.find(:all, :order => 'created_at DESC', :limit=>20) + if params[:display_name] + @this_user = User.find_by_display_name(params[:display_name]) + if @this_user + @title = @this_user.display_name + "'s diary" + @entry_pages, @entries = paginate(:diary_entries, + :conditions => ['user_id = ?', @this_user.id], + :order => 'created_at DESC', + :per_page => 20) + else + @not_found_user = params[:display_name] + render :action => 'no_such_user', :status => :not_found + end + else + @title = "Users' diaries" + @entry_pages, @entries = paginate(:diary_entries, + :order => 'created_at DESC', + :per_page => 20) + end + end + + def rss + if params[:display_name] + user = User.find_by_display_name(params[:display_name]) + @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}" + @link = "http://www.openstreetmap.org/user/#{user.display_name}/diary" + else + @entries = DiaryEntry.find(:all, :order => 'created_at DESC', :limit => 20) + @title = "OpenStreetMap diary entries" + @description = "Recent diary entries from users of OpenStreetMap" + @link = "http://www.openstreetmap.org/diary" + end + + render :content_type => Mime::RSS + end + + def view + user = User.find_by_display_name(params[:display_name]) + @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]]) end end