From 4e9ab9667841764f731ebbdd1be34f897bf30125 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 25 Dec 2014 20:06:44 -0600 Subject: [PATCH 1/2] redirect for original new page path --- app/site_files.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/site_files.rb b/app/site_files.rb index 9de68caf..b3b98354 100644 --- a/app/site_files.rb +++ b/app/site_files.rb @@ -3,6 +3,12 @@ get '/site_files/new_page' do erb :'site_files/new_page' end +# Redirect from original path +get '/site_files/new' do + require_login + redirect '/site_files/new_page' +end + post '/site_files/create_page' do require_login @errors = [] @@ -31,11 +37,6 @@ post '/site_files/create_page' do redirect params[:dir] ? "/dashboard?dir=#{Rack::Utils.escape params[:dir]}" : '/dashboard' end -get '/site_files/new' do - require_login - erb :'site_files/new' -end - def file_upload_response(error=nil) http_error_code = 406 From b3e1fa411070f471734110afa3c826092c9448e0 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 25 Dec 2014 21:52:34 -0600 Subject: [PATCH 2/2] fix for email confirmation display when site not found --- app/site.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/site.rb b/app/site.rb index 5cbd7c61..0d1342f8 100644 --- a/app/site.rb +++ b/app/site.rb @@ -85,7 +85,7 @@ end get '/site/:username/confirm_email/:token' do site = Site[username: params[:username]] - if site.email_confirmation_token == params[:token] + if !site.nil? && site.email_confirmation_token == params[:token] site.email_confirmed = true site.save_changes