0.6c: bunch of minor improvements and bugfixes

[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 2dbf8a0cbbc8d3373e0c29f6622182c02a186bb6..90e53e778d3a5f210c81cc29a6445e2dd0beeaf4 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,15 +1,15 @@
 class DiaryEntryController < ApplicationController
 class DiaryEntryController < ApplicationController

-  layout 'site'
-  
+  layout 'site', :except => :rss
+

   before_filter :authorize_web
   before_filter :require_user, :only => [:new]
 
   def new
     @title = 'new diary entry'
     if params[:diary_entry]     
   before_filter :authorize_web
   before_filter :require_user, :only => [:new]
 
   def new
     @title = 'new diary entry'
     if params[:diary_entry]     

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


@@ -32,24 +32,18 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
 
   def rss
     if params[:display_name]

-      @this_user = User.find_by_display_name(params[:display_name])
-      @entries=DiaryEntry.find(:all, :conditions => ['user_id = ?', @this_user.id], :order => 'created_at DESC', :limit => 20)
-      rss = OSM::GeoRSS.new("OpenStreetMap diary entries for #{@this_user.display_name}", "Recent OpenStreetmap diary entries from #{@this_user.display_name}", "http://www.openstreetmap.org/user/#{@this_user.display_name}/diary") 
+      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"

     else
     else

-      @entries=DiaryEntry.find(:all, :order => 'created_at DESC', :limit => 20)
-      rss = OSM::GeoRSS.new('OpenStreetMap diary entries', 'Recent diary entries from users of OpenStreetMap', 'http://www.openstreetmap.org/diary') 
+      @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
 
     end
 

-    @entries.each do |entry|
-      # add geodata here
-      latitude = nil
-      longitude = nil
-      rss.add(latitude, longitude, entry.title, url_for({:controller => 'diary_entry', :action => 'list', :id => entry.id, :display_name => entry.user.display_name}), entry.body, entry.created_at)
-    end
-
-    response.headers["Content-Type"] = 'application/rss+xml'
-
-    render :text => rss.to_s
+    render :content_type => Mime::RSS

   end
   end

-

 end
 end