From a5a5008ba5d287e78c72b1b1f723f64a508a67f2 Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 20:27:30 +0200 Subject: [PATCH 1/8] Removed unused model --- src/account_helper/models.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/account_helper/models.py b/src/account_helper/models.py index bc55b2b..c37bae7 100644 --- a/src/account_helper/models.py +++ b/src/account_helper/models.py @@ -14,9 +14,9 @@ class Realm(models.Model): return f'{self.name} - {self.ldap_base_dn}' -class DeletedUser(models.Model): - deletion_date = models.DateField(auto_now=True) - user = models.ForeignKey(User, on_delete=models.CASCADE) - - def __str__(self): - return f'{self.user.username} - {self.deletion_date}' +# class DeletedUser(models.Model): +# deletion_date = models.DateField(auto_now=True) +# user = models.ForeignKey(User, on_delete=models.CASCADE) +# +# def __str__(self): +# return f'{self.user.username} - {self.deletion_date}' From a9380fe6fbc7d8a3c6d1debbcecbb5e726724a8a Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 20:34:25 +0200 Subject: [PATCH 2/8] Removed really an unused Class --- src/account_helper/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From e2b35b14de27e50258db3457343c9affaacb8221 Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 20:36:25 +0200 Subject: [PATCH 3/8] Removed really an unused Class, really --- src/account_manager/views/user_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/account_manager/views/user_views.py b/src/account_manager/views/user_views.py index fa7b068..7f3767a 100644 --- a/src/account_manager/views/user_views.py +++ b/src/account_manager/views/user_views.py @@ -12,7 +12,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 From 4b04c6d304129d8d694656347a0520157abd9b4f Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 22:33:29 +0200 Subject: [PATCH 4/8] Fix list display, Fix #72 --- src/static/css/floating_labels.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/static/css/floating_labels.css b/src/static/css/floating_labels.css index 5ef63a4..11e9b92 100644 --- a/src/static/css/floating_labels.css +++ b/src/static/css/floating_labels.css @@ -132,6 +132,11 @@ padding: 0px 2px } +.paginate_button.current { + font-size: 1.4em; + font-weight: bold; +} + @media (max-width: 480px) { .table-search-field { width: 100% !important; From a81c8819c328eb5e6f7be2b2f149492ca1acff34 Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 22:40:45 +0200 Subject: [PATCH 5/8] Remove testmail button for normal admins --- src/templates/realm/realm_detailed.jinja2 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/templates/realm/realm_detailed.jinja2 b/src/templates/realm/realm_detailed.jinja2 index 0e8f68f..cb32341 100644 --- a/src/templates/realm/realm_detailed.jinja2 +++ b/src/templates/realm/realm_detailed.jinja2 @@ -55,12 +55,13 @@ Bereichsinformationen anpassen - {% endif %} - {# E-Mail#} - {# Einstellungen#} - {% if realm.email %} - Test Mail + + {# E-Mail#} + {# Einstellungen#} + {% if realm.email %} + Test Mail + {% endif %} {% endif %} {% block realm_form %} From 324caf701a763f89df996a646267a79c571c30b0 Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 22:43:39 +0200 Subject: [PATCH 6/8] Remove commented code --- src/templates/realm/realm_detailed.jinja2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/templates/realm/realm_detailed.jinja2 b/src/templates/realm/realm_detailed.jinja2 index cb32341..3e88bb8 100644 --- a/src/templates/realm/realm_detailed.jinja2 +++ b/src/templates/realm/realm_detailed.jinja2 @@ -56,8 +56,6 @@ class="fas fa-info-circle"> Bereichsinformationen anpassen - {# E-Mail#} - {# Einstellungen#} {% if realm.email %} Test Mail From 2946d29d84fa1e9e0a1abc7e6dbce011b97af2d6 Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 22:46:24 +0200 Subject: [PATCH 7/8] Fix hidden realm creation button on accounts with lots of realms --- src/templates/base_admin.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %} -
+
From fa756602a3831b6b5fd8ac41bbc6890bfd9f8149 Mon Sep 17 00:00:00 2001 From: MG Date: Wed, 15 May 2019 23:00:09 +0200 Subject: [PATCH 8/8] Fix dataTables collapsed on wide screens, Fix #59 --- src/static/css/floating_labels.css | 5 +++++ src/static/js/main.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/static/css/floating_labels.css b/src/static/css/floating_labels.css index 11e9b92..6b6865a 100644 --- a/src/static/css/floating_labels.css +++ b/src/static/css/floating_labels.css @@ -128,6 +128,10 @@ /*!*visibility: hidden*!*/ /*}*/ +.data-table { + width: 100% !important; +} + .paginate_button { padding: 0px 2px } @@ -137,6 +141,7 @@ 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();