Stop the richtext help wrapping

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 72fe3b241a374e4c514fdd5ce3b76ccd46254245..0e26185a1e34325a5fecb87ec3d50856e7a18a7a 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -5,6 +5,7 @@ class SiteController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]

+  before_filter :require_oauth, :only => [:index]

 
   def index
     unless STATUS == :database_readonly or STATUS == :database_offline
 
   def index
     unless STATUS == :database_readonly or STATUS == :database_offline


@@ -51,7 +52,7 @@ class SiteController < ApplicationController
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
     elsif params[:gpx]
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
     elsif params[:gpx]

-      trace = Trace.find(params[:gpx])
+      trace = Trace.visible_to(@user).find(params[:gpx])

       @lat = trace.latitude
       @lon = trace.longitude
     end
       @lat = trace.latitude
       @lon = trace.longitude
     end


@@ -64,4 +65,8 @@ class SiteController < ApplicationController
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end

+
+  def id
+    render "id", :layout => false
+  end

 end
 end