Fix multiple issues with links to /history from the homepage. Thanks to Ed Avis for...

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

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index b425ef4b6e844ddb6e34d288c74a160bf8ea8414..3ee36af21a9fb53ac5777344ada62cc4a23bce9e 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -3,7 +3,8 @@ class DiaryEntryController < ApplicationController
 
   before_filter :authorize_web
   before_filter :require_user, :only => [:new, :edit]
 
   before_filter :authorize_web
   before_filter :require_user, :only => [:new, :edit]

-  before_filter :check_database_availability
+  before_filter :check_database_readable
+  before_filter :check_database_writable, :only => [:new, :edit]

 
   def new
     @title = 'New diary entry'
 
   def new
     @title = 'New diary entry'


@@ -38,6 +39,8 @@ class DiaryEntryController < ApplicationController
         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
       end
     end
         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
       end
     end

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

   end
 
   def comment
   end
 
   def comment


@@ -54,7 +57,7 @@ class DiaryEntryController < ApplicationController
 
   def list
     if params[:display_name]
 
   def list
     if params[:display_name]

-      @this_user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
+      @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})

 
       if @this_user
         @title = @this_user.display_name + "'s diary"
 
       if @this_user
         @title = @this_user.display_name + "'s diary"


@@ -69,7 +72,8 @@ class DiaryEntryController < ApplicationController
       end
     else
       @title = "Users' diaries"
       end
     else
       @title = "Users' diaries"

-      @entry_pages, @entries = paginate(:diary_entries,
+      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
+                                        :conditions => ["users.visible = ?", true],

                                         :order => 'created_at DESC',
                                         :per_page => 20)
     end
                                         :order => 'created_at DESC',
                                         :per_page => 20)
     end


@@ -77,33 +81,36 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
 
   def rss
     if params[:display_name]

-      user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
+      user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})

 
       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}"
 
       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}"

-        @link = "http://www.openstreetmap.org/user/#{user.display_name}/diary"
+        @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"

 
         render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end
     else
 
         render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end
     else

-      @entries = DiaryEntry.find(:all, :order => 'created_at DESC', :limit => 20)
+      @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"
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"

-      @link = "http://www.openstreetmap.org/diary"
+      @link = "http://#{SERVER_URL}/diary"

 
       render :content_type => Mime::RSS
     end
   end
 
   def view
 
       render :content_type => Mime::RSS
     end
   end
 
   def view

-    user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
+    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 user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])

+      @title = "Users' diaries | #{params[:display_name]}"

     else
       @not_found_user = params[:display_name]
 
     else
       @not_found_user = params[:display_name]