Merge lp:~canonical-isd-hackers/canonical-identity-provider/finish-yubi-rename into lp:~canonical-isd-hackers/canonical-identity-provider/add-yubikey-support

[David Owen]

Finishes the YubiKey->UserYubiKey model rename

=== modified file 'identityprovider/forms.py'
--- identityprovider/forms.py	2011-05-12 15:08:08 +0000
+++ identityprovider/forms.py	2011-05-13 10:10:11 +0000
@@ -97,7 +97,7 @@
 
         account = Account.objects.get_by_email(email)
         try:
-            account.yubikey_set.get(pk=otp[:12])
+            account.useryubikey_set.get(pk=otp[:12])
         except UserYubiKey.DoesNotExist:
             raise forms.ValidationError(_("This key is not valid for "
                                           "this account"))

=== modified file 'identityprovider/views/account.py'
--- identityprovider/views/account.py	2011-05-12 15:08:08 +0000
+++ identityprovider/views/account.py	2011-05-13 10:10:11 +0000
@@ -79,7 +79,7 @@
         'message': request.session.pop('message', None),
         'message_style': 'informational',
         'token': token,
-        'has_keys': bool(account.yubikey_set.count()),
+        'has_keys': bool(account.useryubikey_set.count()),
     })
     return render_to_response('account/edit.html', context)
 
@@ -109,7 +109,7 @@
         'current_section': 'emails',
         'account': account,
         'account_displayname': account.displayname,
-        'yubi_keys': account.yubikey_set.all(),
+        'yubi_keys': account.useryubikey_set.all(),
         'form': form,
         'message': request.session.pop('message', None),
         'message_style': 'informational'
@@ -246,7 +246,7 @@
 
 @login_required
 def delete_key(request, public_id):
-    key = get_object_or_404(request.user.yubikey_set, public_id=public_id)
+    key = get_object_or_404(request.user.useryubikey_set, public_id=public_id)
     if request.method == 'POST':
         account = key.account
         key.delete()