many fixes

website/mixins.py

@@ -6,19 +6,7 @@ from django.contrib.auth.decorators import login_required, permission_required
 from django.template import Template, Context
 from django.views.generic.base import ContextMixin, TemplateResponseMixin
 
-## Utils ##
-APP_ICONS = {
-    'maraudes': 'road',
-    'suivi': 'eye-open',
-}
 
-def get_apps_config(app_names):
-    _apps = []
-    for name in app_names:
-        app_config = apps.get_app_config(name)
-        app_config.menu_icon = APP_ICONS[name]
-        _apps.append(app_config)
-    return _apps
 
 ## Mixins ##
 
@@ -63,12 +51,12 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
     class Configuration:
         stylesheets = ['base.css']
         navbar_apps = ['maraudes', 'suivi']
-        apps = get_apps_config(navbar_apps)
         page_blocks = ['header', 'header_small', 'title']
 
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.user = None
         self._page_blocks = []
         if not hasattr(self, "PageInfo"):
             raise ImproperlyConfigured("You must define a PageInfo on ", self)
@@ -86,10 +74,38 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
             self.content_template = self.template_name
         return self.content_template
 
+    def get_apps_config(self):
+        """ Load additionnal config data on each app registered in navbar"""
+        ## Utils ##
+        APP_ICONS = {
+            'maraudes': 'road',
+            'suivi': 'eye-open',
+        }
+        app_names = self.Configuration.navbar_apps
+        self._apps = []
+        for name in app_names:
+            app_config = apps.get_app_config(name)
+            app_config.menu_icon = APP_ICONS[name]
+            #Known Issue: there is actually no 'suivi.view_suivi' permission yet !
+            app_config.disabled = not self.request.user.has_perm('%s.view_%s' % (name, name))
+            print(self.request.user, app_config, '-> has perm:', not app_config.disabled)
+            self._apps.append(app_config)
+        return self._apps
+
+    @property
+    def apps(self):
+        if not hasattr(self, '_apps'):
+            self._apps = self.get_apps_config()
+        return self._apps
+
     def get_active_app(self):
         if not self.app_name:
             self.app_name = self.__class__.__module__.split(".")[0]
-        return apps.get_app_config(self.app_name)
+        active_app = apps.get_app_config(self.app_name)
+        if not active_app in self.apps: #TODO: how do we deal with this ?
+            print("%s must be registered in Configuration.navbar_apps" % active_app)
+            return None
+        return active_app
 
     @property
     def active_app(self):
@@ -122,7 +138,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
         self._update_context_with_rendered_blocks(context)
         #Website processor
         context['stylesheets'] = self.Configuration.stylesheets
-        context['apps'] = self.Configuration.apps
+        context['apps'] = self.apps
         context['active_app'] = self.active_app
         # User processor
         context = user_processor(self.request, context)

website/templates/navbar.html

@@ -12,7 +12,7 @@
     </div>
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav">{% for app in apps %}
-        <li {% if app == active_app %} class="active" {%endif%}>
+        <li class="{% if app == active_app %}active{%endif%} {% if app.disabled %}disabled{% endif%}">
           <a href="/{{app.label}}/">{% bootstrap_icon app.menu_icon %} &middot; <strong>{{ app.name|title }}</strong></a>
         </li>
         {% if app == active_app %}{% for t in app_menu %}{% include t %}{% endfor %}{% endif %}
@@ -21,11 +21,11 @@
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
           <a id="UserMenu" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-          <strong style="color:#fff;">{% bootstrap_icon "user" %} {{user}} </strong>&middot; {{ user_group }}<span class="caret"></span></a>
+          <strong style="color:#fff;">{% bootstrap_icon "user" %} &middot; {{user}} </strong>&middot; {{ user_group }}<span class="caret"></span></a>
           <ul class="dropdown-menu" aria-labelledby="UserMenu">
             {% if user.is_authenticated %}
-            {% if user.is_superuser %}<li><a href="/admin/">Administration {% bootstrap_icon "new-window" %} </a></li>{% endif %}
-            <li><a href="{% url 'logout' %}">Déconnecter {% bootstrap_icon "log-out" %}</a></li>
+            {% if user.is_superuser %}<li><a href="{% url 'admin:index' %}">{% bootstrap_icon "wrench" %} Administration</a></li>{% endif %}
+            <li><a href="{% url 'logout' %}">{% bootstrap_icon "log-out" %} Déconnecter</a></li>
             {% else %}
             <li>
               <form class="navbar-form navbar-left" method="post" action="">{% csrf_token %}