minor bug fixes and improvements

diff --git a/astakos/im/admin/forms.py b/astakos/im/admin/forms.py
index cd83b78..e86cbac 100644 (file)
--- a/astakos/im/admin/forms.py
+++ b/astakos/im/admin/forms.py
@@ -50,6 +50,7 @@ class AdminProfileForm(forms.ModelForm):
     """
     class Meta:
         model = AstakosUser
+        exclude = ('groups', 'user_permissions')
     
     def __init__(self, *args, **kwargs):
         super(AdminProfileForm, self).__init__(*args, **kwargs)
@@ -57,6 +58,4 @@ class AdminProfileForm(forms.ModelForm):
         ro_fields = ('username','date_joined', 'auth_token', 'last_login', 'email')
         if instance and instance.id:
             for field in ro_fields:
-                if isinstance(self.fields[field].widget, forms.CheckboxInput):
-                    self.fields[field].widget.attrs['disabled'] = True
                 self.fields[field].widget.attrs['readonly'] = True
\ No newline at end of file

diff --git a/astakos/im/admin/views.py b/astakos/im/admin/views.py
index 0edf774..24468a0 100644 (file)
--- a/astakos/im/admin/views.py
+++ b/astakos/im/admin/views.py
@@ -73,7 +73,7 @@ def requires_admin(func):
     @wraps(func)
     def wrapper(request, *args):
         if not settings.BYPASS_ADMIN_AUTH:
-            if isinstance(request.user, AnonymousUser):
+            if request.user.is_anonymous():
                 next = urlencode({'next': request.build_absolute_uri()})
                 login_uri = reverse(index) + '?' + next
                 return HttpResponseRedirect(login_uri)

diff --git a/astakos/im/views.py b/astakos/im/views.py
index 09679fa..b83354f 100644 (file)
--- a/astakos/im/views.py
+++ b/astakos/im/views.py
@@ -296,9 +296,9 @@ def signup(request, template_name='signup.html', extra_context={}, backend=None)
     
     signup.html or ``template_name`` keyword argument.
     """
-    if not backend:
-        backend = get_backend(request)
     try:
+        if not backend:
+            backend = get_backend(request)
         form = backend.get_signup_form()
         if request.method == 'POST':
             if form.is_valid():