X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3b6d2c5336eac35912909c9102c77bf6472901e6..46d529135013091286f3931223b387c571aecdb9:/app/controllers/diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 0ad71da17..b425ef4b6 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -6,30 +6,37 @@ class DiaryEntryController < ApplicationController
   before_filter :check_database_availability
 
   def new
-    @title = 'new diary entry'
+    @title = 'New diary entry'
+
     if params[:diary_entry]     
       @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 
+      else
+        render :action => 'edit'
       end
+    else
+      render :action => 'edit'
     end
   end
 
   def edit
-    @title= 'edit diary entry'
+    @title= 'Edit diary entry'
     @diary_entry = DiaryEntry.find(params[:id])
+
     if @user != @diary_entry.user
-	  redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
-    end
-    if params[:diary_entry]
+      redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
+    elsif params[:diary_entry]
       @diary_entry.title = params[:diary_entry][:title]
       @diary_entry.body = params[:diary_entry][:body]
       @diary_entry.latitude = params[:diary_entry][:latitude]
       @diary_entry.longitude = params[:diary_entry][:longitude]
+
       if @diary_entry.save
         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
-	  end
+      end
     end
   end
 
@@ -44,10 +51,11 @@ class DiaryEntryController < ApplicationController
       render :action => 'view'
     end
   end
-  
+
   def list
     if params[:display_name]
-      @this_user = User.find_by_display_name(params[:display_name])
+      @this_user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
+
       if @this_user
         @title = @this_user.display_name + "'s diary"
         @entry_pages, @entries = paginate(:diary_entries,
@@ -69,7 +77,7 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
-      user = User.find_by_display_name(params[:display_name])
+      user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
 
       if user
         @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20)
@@ -92,7 +100,7 @@ class DiaryEntryController < ApplicationController
   end
 
   def view
-    user = User.find_by_display_name(params[:display_name])
+    user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])