Projet

Général

Profil

0001-manager-add-a-me-view-15264.patch

Benjamin Dauvergne, 04 juillet 2019 19:36

Télécharger (2,76 ko)

Voir les différences: 

Subject: [PATCH] manager: add a me/ view (#15264)

This view redirects to the user's manager view if possible or to
/accounts/.

 .../manager/templates/authentic2/manager/base.html       | 4 ++++
 src/authentic2/manager/urls.py                           | 1 +
 src/authentic2/manager/user_views.py                     | 9 ++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)
src/authentic2/manager/templates/authentic2/manager/base.html
7 7 
{% block page-title %}{% firstof manager_site_title site_title "Authentic2" %}{% endblock %}
8 8 
{% block site-title %}{% firstof manager_site_title site_title "Authentic2" %}{% endblock %}
9 9 

  		




  
  10
  
    
{% block user-name %}

  		




  
  11
  
    
<a href="{% url "a2-manager-me" %}">{{ block.super }}</a>

  		




  
  12
  
    
{% endblock %}

  		




  
  13
  
    

  		




  10
  14
  
    
{% block logout-url %}{% url 'auth_logout' %}?next={{ request.get_full_path|urlencode }}{% endblock %}

  		




  11
  15
  
    

  		




  12
  16
  
    
{% block appbar %}

  		












  

    
      src/authentic2/manager/urls.py
    
  





  32
  32
  
    
    manager_login_required, [

  		




  33
  33
  
    
        # homepage

  		




  34
  34
  
    
        url(r'^$', views.homepage, name='a2-manager-homepage'),

  		




  
  35
  
    
        url(r'^me/$', user_views.me, name='a2-manager-me'),

  		




  35
  36
  
    

  		




  36
  37
  
    
        # Authentic2 users

  		




  37
  38
  
    
        url(r'^users/$', user_views.users, name='a2-manager-users'),

  		












  

    
      src/authentic2/manager/user_views.py
    
  





  28
  28
  
    
from django.contrib.auth import get_user_model

  		




  29
  29
  
    
from django.contrib.contenttypes.models import ContentType

  		




  30
  30
  
    
from django.contrib import messages

  		




  31
  
  
    
from django.views.generic import FormView, TemplateView

  		




  
  31
  
    
from django.views.generic import FormView, TemplateView, RedirectView

  		




  32
  32
  
    
from django.http import Http404, FileResponse

  		




  33
  33
  
    

  		




  34
  34
  
    
import tablib

  		




  ......




  788
  788
  
    
        return ctx

  		




  789
  789
  
    

  		




  790
  790
  
    
user_import_report = UserImportReportView.as_view()

  		




  
  791
  
    

  		




  
  792
  
    

  		




  
  793
  
    
def me(request):

  		




  
  794
  
    
    if request.user.has_perm('custom_user.admin_user', request.user):

  		




  
  795
  
    
        return redirect(request, 'a2-manager-user-detail', kwargs={'pk': request.user.pk})

  		




  
  796
  
    
    else:

  		




  
  797
  
    
        return redirect(request, 'account_management')

  		




  791
  
  
    
-