diff --git a/src/account_helper/admin.py b/src/account_helper/admin.py index 1929cf8..b3cca1d 100644 --- a/src/account_helper/admin.py +++ b/src/account_helper/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import Realm, DeletedUser +from .models import Realm # Register your models here. admin.site.register(Realm) -admin.site.register(DeletedUser) +# admin.site.register(DeletedUser) diff --git a/src/account_helper/models.py b/src/account_helper/models.py index f363f52..1e6d559 100644 --- a/src/account_helper/models.py +++ b/src/account_helper/models.py @@ -14,16 +14,3 @@ class Realm(models.Model): def __str__(self): return f'{self.name} - {self.ldap_base_dn}' - -def get_deletion_time(): - return timezone.now() + timezone.timedelta(+14) - - -class DeletedUser(models.Model): - deletion_marker_date = models.DateField(auto_now_add=True) - user = models.ForeignKey(User, on_delete=models.CASCADE) - ldap_dn = models.CharField(max_length=512, unique=True) - deletion_date = models.DateField(default=get_deletion_time) - - def __str__(self): - return f'{self.user.username} - {self.deletion_marker_date} - {self.deletion_date} - {self.ldap_dn}' diff --git a/src/account_manager/views/user_views.py b/src/account_manager/views/user_views.py index a20529f..a4a3460 100644 --- a/src/account_manager/views/user_views.py +++ b/src/account_manager/views/user_views.py @@ -13,7 +13,7 @@ from django.shortcuts import render, redirect from django.utils.translation import gettext as _ from ldap import ALREADY_EXISTS, OBJECT_CLASS_VIOLATION -from account_helper.models import Realm, DeletedUser +from account_helper.models import Realm from account_manager.forms import AddLDAPUserForm, UserDeleteListForm, UpdateLDAPUserForm, AdminUpdateLDAPUserForm, \ UserGroupListForm from account_manager.main_views import is_realm_admin diff --git a/src/static/css/floating_labels.css b/src/static/css/floating_labels.css index 5ef63a4..6b6865a 100644 --- a/src/static/css/floating_labels.css +++ b/src/static/css/floating_labels.css @@ -128,10 +128,20 @@ /*!*visibility: hidden*!*/ /*}*/ +.data-table { + width: 100% !important; +} + .paginate_button { padding: 0px 2px } +.paginate_button.current { + font-size: 1.4em; + font-weight: bold; +} + + @media (max-width: 480px) { .table-search-field { width: 100% !important; diff --git a/src/static/js/main.js b/src/static/js/main.js index bbcf965..0983d36 100644 --- a/src/static/js/main.js +++ b/src/static/js/main.js @@ -26,9 +26,9 @@ $(document).ready(function () { }, }, rowReorder: { - selector: true, + selector: 'td:nth-child(2)' }, - responsive: true, + responsive: true }); $('#data-table-search-input').keyup(function () { data_table.search($(this).val()).draw(); diff --git a/src/templates/base_admin.jinja2 b/src/templates/base_admin.jinja2 index 5f12da9..366f29e 100644 --- a/src/templates/base_admin.jinja2 +++ b/src/templates/base_admin.jinja2 @@ -39,7 +39,7 @@ {% endif %} {% endif %} {% if request.user.is_superuser %} -
+
diff --git a/src/templates/realm/realm_detailed.jinja2 b/src/templates/realm/realm_detailed.jinja2 index 0e8f68f..3e88bb8 100644 --- a/src/templates/realm/realm_detailed.jinja2 +++ b/src/templates/realm/realm_detailed.jinja2 @@ -55,12 +55,11 @@ Bereichsinformationen anpassen - {% endif %} - {# E-Mail#} - {# Einstellungen#} - {% if realm.email %} - Test Mail + + {% if realm.email %} + Test Mail + {% endif %} {% endif %}
{% block realm_form %}