[cig-commits] r12446 - cs/portal/trunk/northridge/SeismoWebPortal

[leif at geodynamics.org]

Author: leif
Date: 2008-07-18 13:07:03 -0700 (Fri, 18 Jul 2008)
New Revision: 12446

Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/forms.py
   cs/portal/trunk/northridge/SeismoWebPortal/urls.py
Log:
Fixed "Profile" bugs introduced in r12419.


Modified: cs/portal/trunk/northridge/SeismoWebPortal/forms.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/forms.py	2008-07-18 19:57:55 UTC (rev 12445)
+++ cs/portal/trunk/northridge/SeismoWebPortal/forms.py	2008-07-18 20:07:03 UTC (rev 12446)
@@ -370,7 +370,7 @@
         new_data.update(userInfo.__dict__)
         return new_data
     
-    def save(self, new_data):
+    def save(self, new_data, inviteCode):
         user = self.user
         userInfo = user.userinfo
         # Save the new user.

Modified: cs/portal/trunk/northridge/SeismoWebPortal/urls.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/urls.py	2008-07-18 19:57:55 UTC (rev 12445)
+++ cs/portal/trunk/northridge/SeismoWebPortal/urls.py	2008-07-18 20:07:03 UTC (rev 12446)
@@ -16,8 +16,8 @@
     (r'^(?P<pathname>pwreset/done/)$', 'SeismoWebPortal.views.directToTemplate', dict(template = 'registration/pwreset_done.html')),
     
     (r'^(?P<pathname>registration/)$', 'SeismoWebPortal.views.registration'),
+    (r'^(?P<pathname>registration/password/)$', 'SeismoWebPortal.views.password_change', dict(template_name = 'SeismoWebPortal/password_change_form.html')),
     (r'^(?P<pathname>registration/)(?P<inviteCode>\w+)/$', 'SeismoWebPortal.views.registration'),
-    (r'^(?P<pathname>registration/password/)$', 'SeismoWebPortal.views.password_change', dict(template_name = 'SeismoWebPortal/password_change_form.html')),
 
     (r'^(?P<pathname>style.css)$', 'SeismoWebPortal.views.directToTemplate', dict(template = 'SeismoWebPortal/style.css', mimetype='text/css')),