cosmetic tweaks to 'login' and 'create account' screens

[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 c0d7204d57a7d539c2a040f14ea0c15772ae1fd3..d9f5e4253fedab9391f3b869e11f017c72e6218c 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -2,16 +2,40 @@ class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 
   before_filter :authorize_web
-  before_filter :require_user, :only => [:new]
+  before_filter :require_user, :only => [:new, :edit]
   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'
+    @diary_entry = DiaryEntry.find(params[:id])
+
+    if @user != @diary_entry.user
+      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
@@ -27,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 => true})
+
       if @this_user
         @title = @this_user.display_name + "'s diary"
         @entry_pages, @entries = paginate(:diary_entries,
@@ -44,7 +69,8 @@ class DiaryEntryController < ApplicationController
       end
     else
       @title = "Users' diaries"
-      @entry_pages, @entries = paginate(:diary_entries,
+      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
+                                        :conditions => "users.visible = 1",
                                         :order => 'created_at DESC',
                                         :per_page => 20)
     end
@@ -52,7 +78,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 => true})
 
       if user
         @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20)
@@ -65,7 +91,9 @@ class DiaryEntryController < ApplicationController
         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 = 1",
+                                 :order => 'created_at DESC', :limit => 20)
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://www.openstreetmap.org/diary"
@@ -75,7 +103,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 => true})
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])