Drop old templates and old search

users/migrations/0026_auto_20190809_0802.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.22 on 2019-08-09 06:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0025_auto_20190808_1213'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='right',
+            unique_together=set([]),
+        ),
+        migrations.RemoveField(
+            model_name='right',
+            name='right',
+        ),
+        migrations.RemoveField(
+            model_name='right',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='ListRight',
+        ),
+        migrations.DeleteModel(
+            name='Right',
+        ),
+    ]

users/models.py

@@ -70,35 +70,6 @@ class Request(models.Model):
         super().save()
 
 
-class Right(models.Model):
-    PRETTY_NAME = "Droits affectés à des users"
-
-    user = models.ForeignKey('User', on_delete=models.PROTECT)
-    right = models.ForeignKey('ListRight', on_delete=models.PROTECT)
-
-    class Meta:
-        verbose_name = _("right")
-        verbose_name_plural = _("rights")
-        unique_together = ("user", "right")
-
-    def __str__(self):
-        return str(self.user)
-
-
-class ListRight(models.Model):
-    PRETTY_NAME = "Liste des droits existants"
-
-    listright = models.CharField(max_length=255, unique=True)
-    details = models.CharField(
-        help_text="Description",
-        max_length=255,
-        blank=True,
-    )
-
-    def __str__(self):
-        return self.listright
-
-
 class Clef(models.Model):
     nom = models.CharField(max_length=255, unique=True)
     proprio = models.ForeignKey('User', on_delete=models.PROTECT, blank=True,

users/templates/users/user.html

@@ -1,27 +1,9 @@
-{% extends "admin/base_site.html" %}
+{% extends "base_form.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 
-{% load i18n static %}
-
-{% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a>
-        {% if title %} &rsaquo; {{ title }}{% endif %}
-    </div>
-{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    {# Load Django Admin widgets #}
-    <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
-    <script type="text/javascript" src="{% static 'admin/js/core.js' %}"></script>
-    {{ form.media }}
-{% endblock %}
-
-{% block extrastyle %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">
-{% endblock %}
+{% load i18n %}
 
 {% block content %}
     <form method="post" onsubmit="window.onbeforeunload=null">{% csrf_token %}
@@ -54,9 +36,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <div>
                         <label>Mot de passe</label>
                         <div class="readonly">
-                            <a class="button" href="{% url 'users:password' %}">
-                                Changer le mot de passe
-                            </a>
+                            {% if user.has_usable_password %}
+                                <a class="button" href="{% url 'password_change' %}">{% trans 'Change password' %}</a>
+                            {% endif %}
                         </div>
                     </div>
                 </div>
@@ -67,6 +49,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <input class="default" type="submit" value="{% trans 'Create or edit' %}">
         </div>
     </form>
-
-
 {% endblock %}

users/urls.py

@@ -10,7 +10,6 @@ app_name = 'users'
 urlpatterns = [
     url(r'^new_user/$', views.new_user, name='new-user'),
     url(r'^edit_info/$', views.edit_info, name='edit-info'),
-    url(r'^password/$', views.password, name='password'),
     url(r'^adherer/(?P<userid>[0-9]+)$', views.adherer, name='adherer'),
     url(r'^process/(?P<token>[a-z0-9]{32})/$', views.process, name='process'),
 ]

users/views.py

@@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _
 from reversion import revisions as reversion
 
 from med.settings import ASSO_EMAIL, ASSO_NAME, EMAIL_FROM, \
-    REQ_EXPIRE_STR, SITE_NAME
+    REQ_EXPIRE_STR
 from users.forms import BaseInfoForm
 from users.forms import PassForm
 from users.models import Adhesion, Request, User
@@ -52,12 +52,12 @@ def reset_passwd_mail(req, request):
         'name': str(req.user.first_name) + ' ' + str(req.user.last_name),
         'asso': ASSO_NAME,
         'asso_mail': ASSO_EMAIL,
-        'site_name': SITE_NAME,
+        'site_name': 'Mediatek',
         'url': request.build_absolute_uri(
             reverse('users:process', kwargs={'token': req.token})),
         'expire_in': REQ_EXPIRE_STR,
     }
-    send_mail('Votre compte %s' % SITE_NAME, t.render(c),
+    send_mail('Votre compte Mediatek', t.render(c),
               EMAIL_FROM, [req.user.email], fail_silently=False)
     return
 
@@ -111,20 +111,6 @@ def edit_info(request):
     }, 'users/user.html', request)
 
 
-@login_required
-def password(request):
-    """
-    Reinitialisation d'un mot de passe
-    """
-    u_form = PassForm(request.POST or None)
-    if u_form.is_valid():
-        return password_change_action(u_form, request.user, request)
-    return form({
-        'form': u_form,
-        'title': _('Change password'),
-    }, 'users/user.html', request)
-
-
 @login_required
 @permission_required('users.add_adhesion')
 def adherer(request, userid):
@@ -159,4 +145,4 @@ def process_passwd(request, req):
     user = req.user
     if u_form.is_valid():
         return password_change_action(u_form, user, request, req=req)
-    return form({'userform': u_form}, 'users/user.html', request)
+    return form({'form': u_form}, 'users/user.html', request)