uptodate with en.yml 15663

[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..46986acb4c223023a9f7ce4febf2946216639ef0 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -2,20 +2,44 @@ class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 
   before_filter :authorize_web
   layout 'site', :except => :rss
 
   before_filter :authorize_web

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

 
   def new
 
   def new

-    @title = 'new diary entry'
+    @title = t 'diary_entry.new.title'
+

     if params[:diary_entry]     
       @diary_entry = DiaryEntry.new(params[:diary_entry])
       @diary_entry.user = @user
     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 
       if @diary_entry.save 
         redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name 

+      else
+        render :action => 'edit'

       end
       end

+    else
+      @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language)
+      render :action => 'edit'

     end
   end
 
     end
   end
 

+  def edit
+    @title= t 'diary_entry.edit.title'
+    @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]
+      if @diary_entry.update_attributes(params[:diary_entry])
+        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
     @entry = DiaryEntry.find(params[:id])
     @diary_comment = @entry.diary_comments.build(params[:diary_comment])
   def comment
     @entry = DiaryEntry.find(params[:id])
     @diary_comment = @entry.diary_comments.build(params[:diary_comment])


@@ -27,12 +51,13 @@ class DiaryEntryController < ApplicationController
       render :action => 'view'
     end
   end
       render :action => 'view'
     end
   end

-  
+

   def list
     if params[:display_name]
   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
       if @this_user

-        @title = @this_user.display_name + "'s diary"
+        @title = t 'diary_entry.list.user_title', :user => @this_user.display_name

         @entry_pages, @entries = paginate(:diary_entries,
                                           :conditions => ['user_id = ?', @this_user.id],
                                           :order => 'created_at DESC',
         @entry_pages, @entries = paginate(:diary_entries,
                                           :conditions => ['user_id = ?', @this_user.id],
                                           :order => 'created_at DESC',


@@ -43,8 +68,9 @@ class DiaryEntryController < ApplicationController
         render :action => 'no_such_user', :status => :not_found
       end
     else
         render :action => 'no_such_user', :status => :not_found
       end
     else

-      @title = "Users' diaries"
-      @entry_pages, @entries = paginate(:diary_entries,
+      @title = t 'diary_entry.list.title'
+      @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


@@ -52,33 +78,49 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
 
   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)
         @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
 
         render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end

+    elsif params[:language]
+      @entries = DiaryEntry.find(:all, :include => :user,
+        :conditions => ["users.visible = ? AND diary_entries.language = ?", true, params[:language]],
+        :order => 'created_at DESC', :limit => 20)
+      @title = "OpenStreetMap diary entries in #{params[:language]}"
+      @description = "Recent diary entries from users of OpenStreetMap"
+      @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
+      
+      render :content_type => Mime::RSS

     else
     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])
+    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]])

+      if @entry
+        @title = t 'diary_entry.view.title', :user => params[:display_name]
+      else
+        render :action => 'no_such_entry', :status => :not_found
+      end

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