cleaned up code in website, utilisateurs

suivi/templates/suivi/index.html

@@ -1,3 +1,8 @@
+<div class="col-md-6 col-md-offset-6">
+<h4>Ces derniers temps</h4>
+<h4>Vigilance</h4>
+</div>
+</div>
 <div class="col-md-6 col-md-offset-6">
   <h4><strong>Créer une note :</strong></h4>
   <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">

utilisateurs/models.py

@@ -52,7 +52,9 @@ class MaraudeurManager(UserManager):
             'first_name': first_name,
             'last_name': last_name,
             'email': "%s@alsa68.org" % username,
-            }
+            'is_staff': True,
+            'is_active': True,
+           }
 
         return super().create_user(username, **data)
 

website/backends.py

@@ -2,24 +2,22 @@ from django.contrib.auth.backends import ModelBackend
 
 from utilisateurs.models import Maraudeur
 
+
+def user_models():
+    return (Maraudeur,)
+
 class MyBackend(ModelBackend):
 
-    def authenticate(self, **kwargs):
-        print('authenticate using MyBackend')
-        return super().authenticate(**kwargs)
-
     def get_user(self, user_id):
-        """ Retourne la classe enfant de l'utilisateur connecté
+        """ Essaye de récupérer une classe enfant de User existante, telle que
-            s'il en a une, sinon le User par défaut.
+            définie dans 'utilisateurs.models'. Fallback to default user.
         """
-        print('use MyBackend: get_user', user_id)
+        for user_model in user_models():
-        try:
+            try:
-            user = Maraudeur.objects.get(pk=user_id)
+                return user_model.objects.get(pk=user_id)
-        except Maraudeur.DoesNotExist:
+            except user_model.DoesNotExist:
-            print('no Maraudeur found. Using base user class')
+                print('Tried %s.' % user_model.__class__)
-            user = super().get_user(user_id)
+        return super().get_user(user_id)
-        print("found:", user, user.__class__)
-        return user
 
     def has_perm(self, *args, **kwargs):
         print('call has_perm', args, kwargs)

website/mixins.py

@@ -2,8 +2,6 @@ import datetime
 from django.utils import timezone
 from django.core.exceptions import ImproperlyConfigured
 from django.apps import apps
-#TODO: remove next line
-from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.decorators import user_passes_test
 from django.template import Template, Context
 from django.views.generic.base import ContextMixin, TemplateResponseMixin
@@ -12,13 +10,6 @@ from django.views.generic.base import ContextMixin, TemplateResponseMixin
 
 ## Mixins ##
 
-class PermissionRequiredMixin(object):
-    permissions = []
-    @classmethod
-    def as_view(cls, **initkwargs):
-        view = super(PermissionRequiredMixin, cls).as_view(**initkwargs)
-        return permission_required(cls.permissions)(view)
-
 def special_user_required(authorized_users):
 
     valid_cls = tuple(authorized_users)
@@ -54,7 +45,7 @@ class TemplateFieldsMetaclass(type):
 
 
 def user_processor(request, context):
-    context['user_group'] = request.user.groups.first()
+    context['user_group'] = request.user.__class__.__qualname__
     return context
 
 
@@ -83,7 +74,6 @@ class NavbarMixin(object):
             app_config.menu_icon = APP_ICONS[name]
             #TODO: Seems unsafe (only need module perm)
             app_config.disabled = not self.request.user.has_module_perms(name)
-            print(self.request.user, app_config, '-> has perm:', not app_config.disabled)
             self._apps.append(app_config)
         return self._apps