Don't try and store a user record in the session

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index e6d09f18d787b3b1d436bda46ac21f76cb6defb1..fa33deeeeead9b95cca0368de32886529bf557ff 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,5 +1,6 @@
 class SiteController < ApplicationController
   layout 'site', :except => [:key, :permalink]
 class SiteController < ApplicationController
   layout 'site', :except => [:key, :permalink]

+  layout false, :only => [:key, :permalink]

 
   before_filter :authorize_web
   before_filter :set_locale
 
   before_filter :authorize_web
   before_filter :set_locale


@@ -32,9 +33,9 @@ class SiteController < ApplicationController
   end
 
   def edit
   end
 
   def edit

-    editor = @user.preferred_editor || DEFAULT_EDITOR
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR

 
 

-    if editor == "josm"
+    if editor == "remote"

       render :action => :index
     else
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this
       render :action => :index
     else
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this


@@ -48,8 +49,22 @@ class SiteController < ApplicationController
         @lat = params['mlat'].to_f
         @zoom = params['zoom'].to_i
 
         @lat = params['mlat'].to_f
         @zoom = params['zoom'].to_i
 

+      elsif params['bbox']
+        bbox = BoundingBox.from_bbox_params(params)
+
+        @lon = bbox.centre_lon
+        @lat = bbox.centre_lat
+        @zoom = 16
+      elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+        bbox = BoundingBox.from_lon_lat_params(params)
+
+        @lon = bbox.centre_lon
+        @lat = bbox.centre_lat
+        @zoom = 16
+

       elsif params['gpx']
       elsif params['gpx']

-        #use gpx id to locate (dealt with below)
+        @lon = Trace.find(params['gpx']).longitude
+        @lat = Trace.find(params['gpx']).latitude

 
       elsif cookies.key?("_osm_location")
         @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")
 
       elsif cookies.key?("_osm_location")
         @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")


@@ -63,7 +78,15 @@ class SiteController < ApplicationController
         #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
       end
 
         #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
       end
 

-      @zoom = '14' if @zoom.nil?
+      @zoom = '17' if @zoom.nil?

     end
   end
     end
   end

+
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end
+
+  def preview
+    render :text => RichText.new(params[:format], params[:text]).to_html
+  end

 end
 end