Fix major bug: Change hard coded registration form redirect to based on User and do int conversions for ids.

--HG--
extra : rebase_source : a86c96c28180cb560ca3d745a815b03996395125

2 files changed, 3 insertions, 3 deletions

diff --git a/project/scipycon/registration/views.py b/project/scipycon/registration/views.py
index ecc4254..b64b66b 100644
--- a/project/scipycon/registration/views.py
+++ b/project/scipycon/registration/views.py
@@ -56,7 +56,7 @@ def edit_registration(request, scope, id,
 
     scope_entity = Event.objects.get(scope=scope)
 
-    reg = Registration.objects.get(pk=id)
+    reg = Registration.objects.get(pk=int(id))
     wifi = Wifi.objects.get(user=reg.registrant)
 
     # TODO: This is an ugly hack to add accommodation form
diff --git a/project/templates/registration/edit-registration.html b/project/templates/registration/edit-registration.html
index 07b67c7..7e317af 100644
--- a/project/templates/registration/edit-registration.html
+++ b/project/templates/registration/edit-registration.html
@@ -9,11 +9,11 @@
 {% block overreg %}{% endblock overreg %}
 
 {% block url_select_login %}
-  "{% url scipycon_edit_registration params.scope 1 %}"
+  "{% url scipycon_edit_registration params.scope registration.id %}"
 {% endblock url_select_login %}
 
 {% block url_select_reg %}
-  "{% url scipycon_edit_registration params.scope 1 %}"
+  "{% url scipycon_edit_registration params.scope registration.id %}"
 {% endblock url_select_reg %}
 
 {% block formextras %}