From 4d97c2998000639481a495e16a89bf2615a433e4 Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Sat, 2 Nov 2013 11:03:26 +0000
Subject: [PATCH] Change firstboot redirects so they don't go to
 firstboot/firstboot.

---
 modules/installed/first_boot.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py
index 9d47e7cd9..8b1f3d663 100644
--- a/modules/installed/first_boot.py
+++ b/modules/installed/first_boot.py
@@ -81,11 +81,11 @@ class FirstBoot(PagePlugin):
             ## Update state to 1 and head there
             with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db:
                 db['state']=1
-            raise cherrypy.InternalRedirect('firstboot/state1')
+            raise cherrypy.InternalRedirect('state1')
 
         main = "<p>Welcome.  It looks like this FreedomBox isn't set up yet.  We'll need to ask you a just few questions to get started.</p>"
         form = Form(title="Welcome to Your FreedomBox!",
-                        action="firstboot",
+                        action="", # stay at firstboot
                         name="whats_my_name",
                         message=message)
         form.text = '<script type="text/javascript" src="/static/js/md5.js"></script>\n'+form.text
@@ -133,7 +133,7 @@ see the rest of the web interface.</p>"
             with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db:
                 db['state']=1
                             #TODO: switch to HTTPS
-            raise cherrypy.InternalRedirect('firstboot/state1')
+            raise cherrypy.InternalRedirect('state1')
 
         return self.fill_template(template="base", title=_("Installing the Certificate"), main=main,
         sidebar_right=_("""<strong>Getting Help</strong><p>We've done our best to make your FreedomBox easy to use.  If you have questions during setup, there are a few places to turn for help. TODO: add links to such help.</p>"""))