Allow a user's email address to be marked invalid, and suppress most

[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 a3b37b931beabf3c7cd9fcbca435d62c41c37914..c0d7204d57a7d539c2a040f14ea0c15772ae1fd3 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -3,6 +3,7 @@ class DiaryEntryController < ApplicationController
 
   before_filter :authorize_web
   before_filter :require_user, :only => [:new]
 
   before_filter :authorize_web
   before_filter :require_user, :only => [:new]

+  before_filter :check_database_availability

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


@@ -38,6 +39,7 @@ class DiaryEntryController < ApplicationController
                                           :per_page => 20)
       else
         @not_found_user = params[:display_name]
                                           :per_page => 20)
       else
         @not_found_user = params[:display_name]

+

         render :action => 'no_such_user', :status => :not_found
       end
     else
         render :action => 'no_such_user', :status => :not_found
       end
     else


@@ -51,22 +53,36 @@ class DiaryEntryController < ApplicationController
   def rss
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name])
   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"
+
+      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"
+
+        render :content_type => Mime::RSS
+      else
+        render :nothing => true, :status => :not_found
+      end

     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"
     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
+      render :content_type => Mime::RSS
+    end

   end
 
   def view
     user = User.find_by_display_name(params[:display_name])
   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]])
+
+    if user
+      @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])
+    else
+      @not_found_user = params[:display_name]
+
+      render :action => 'no_such_user', :status => :not_found
+    end

   end
 end
   end
 end