X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/64e4cdefe89f642d349b5908a3bbaec76333e3b2..b526716c8d778a9a650312806a8009bc8bbc7c04:/contrib/waldo/models.py

diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py
index e3dd079..2f40da7 100644
--- a/contrib/waldo/models.py
+++ b/contrib/waldo/models.py
@@ -67,10 +67,6 @@ class LoginMultiView(MultiView):
 		}
 		kwargs.update(reverse_kwargs or {})
 		return 'http://%s%s' % (current_site.domain, self.reverse(confirmation_view, kwargs=kwargs, node=node))
-		
-	def get_context(self):
-		"""Hook for providing instance-specific context - such as the value of a Field - to all views."""
-		return {}
 	
 	def display_login_page(self, request, message, extra_context=None):
 		request.session.set_test_cookie()
@@ -379,18 +375,9 @@ class AccountMultiView(LoginMultiView):
 		return self.manage_account_page.render_to_response(request, extra_context=context)
 	
 	def has_valid_account(self, user):
-		user_form, profile_form = self.get_account_forms()
-		forms = []
-		forms.append(user_form(data=get_field_data(user, self.user_fields)))
-		
-		if profile_form is not None:
-			profile = self.account_profile._default_manager.get_or_create(user=user)[0]
-			forms.append(profile_form(data=get_field_data(profile, self.account_profile_fields)))
-		
-		for form in forms:
-			if not form.is_valid():
-				return False
-		return True
+		form = self.account_form(user, {})
+		form.data = form.initial
+		return form.is_valid()
 	
 	def account_required(self, view):
 		def inner(request, *args, **kwargs):