Correct merge issues in the last merge from master

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 9bee03209f204ee08c24e4133c19bd5610d4e9a2..1478c5773cda99cf2b59c9b15f6fbfc4eaba6cb3 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,9 +1,33 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  before_filter :set_locale
+  layout 'site', :except => [:key, :permalink]
+

   before_filter :authorize_web
   before_filter :authorize_web

+  before_filter :set_locale

   before_filter :require_user, :only => [:edit]
 
   def export
     render :action => 'index'
   end
   before_filter :require_user, :only => [:edit]
 
   def export
     render :action => 'index'
   end

+
+  def permalink
+    lon, lat, zoom = ShortLink::decode(params[:code])
+    new_params = params.clone
+    new_params.delete :code
+    if new_params.has_key? :m
+      new_params.delete :m
+      new_params[:mlat] = lat
+      new_params[:mlon] = lon
+    else
+      new_params[:lat] = lat
+      new_params[:lon] = lon
+    end
+    new_params[:zoom] = zoom
+    new_params[:controller] = 'site'
+    new_params[:action] = 'index'
+    redirect_to new_params
+  end
+
+  def key
+    expires_in 7.days, :public => true
+  end

 end
 end