X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/4a51c1aaa9c3eeac5368ff4e06870a94f18123aa..a92081108f2f9f0f70bd804bd3e87ab16bd02ea7:/cas_provider/forms.py?ds=sidebyside

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 8a1452a..88d2926 100644
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -11,7 +11,7 @@ class LoginForm(forms.Form):
     password = forms.CharField(widget=forms.PasswordInput)
     #warn = forms.BooleanField(required=False)  # TODO: Implement
     lt = forms.CharField(widget=forms.HiddenInput, initial=create_login_ticket, required=False)
-    service = forms.CharField(widget=forms.HiddenInput, initial='', required=False)
+    service = forms.CharField(widget=forms.HiddenInput, required=False)
     remember_me = forms.BooleanField(required=False)
 
     def __init__(self, *args, **kwargs):
@@ -28,11 +28,12 @@ class LoginForm(forms.Form):
 
     def clean_lt(self):
         lt = self.cleaned_data.get('lt',
-                                   self.initial.get('lt',
-                                                    self.fields['lt'].initial()))
+                                   self.initial.get('lt', None))
+        if lt is None:
+            lt = self.fields['lt'].initial()
         try:
             login_ticket = LoginTicket.objects.get(ticket=lt)
-        except:
+        except LoginTicket.DoesNotExist:
             raise forms.ValidationError("Login ticket expired. Please try again.")
         else:
             login_ticket.delete()