cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only Potlatch 1 needs a token to be created

Browse source
This commit is contained in:
Tom Hughes 2010-11-14 17:36:46 +00:00
parent c3453cf57d
commit 6c3b5aa9d4
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/site_controller.rb
View file

@ -37,8 +37,6 @@ class SiteController < ApplicationController
if editor == "josm" if editor == "josm"
render :action => :index render :action => :index
else else
session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
# Decide on a lat lon to initialise potlatch with. Various ways of doing this # Decide on a lat lon to initialise potlatch with. Various ways of doing this
if params['lon'] and params['lat'] if params['lon'] and params['lat']
@lon = params['lon'].to_f @lon = params['lon'].to_f

3
app/views/site/_potlatch.html.erb
View file

@ -3,6 +3,9 @@
</div> </div>
<%= javascript_include_tag 'swfobject.js' %> <%= javascript_include_tag 'swfobject.js' %>
<% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
<script type="text/javascript" defer="defer"> <script type="text/javascript" defer="defer">
var brokenContentSize = $("content").offsetWidth == 0; var brokenContentSize = $("content").offsetWidth == 0;
var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF"); var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");