From feee8b74ed21b6de87487bb53693f1c2a9d35848 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 3 Apr 2024 08:26:00 +0200 Subject: [PATCH 1/4] # Admin button * adds button for easier admin backend access --- templates/navbars/navbar.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/navbars/navbar.html b/templates/navbars/navbar.html index ffb27e8..9d1d685 100644 --- a/templates/navbars/navbar.html +++ b/templates/navbars/navbar.html @@ -53,6 +53,9 @@ {{ user.username }}
+ {% if user.is_staff or user.is_superuser %} + {% fa5_icon 'tools' %} {% trans 'Admin' %} + {% endif %} {% fa5_icon 'cogs' %} {% trans 'Settings' %} {% fa5_icon 'sign-out-alt' %} {% trans 'Logout' %}
From 03edb74023f497b0e1a4f663c2f8f81aef1ed13d Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 3 Apr 2024 08:29:19 +0200 Subject: [PATCH 2/4] # Admin backends * disables certain admin backends * adds proper ordering to server message admin overview --- compensation/admin.py | 2 +- ema/admin.py | 1 + konova/admin.py | 2 +- news/admin.py | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compensation/admin.py b/compensation/admin.py index c018621..fc59451 100644 --- a/compensation/admin.py +++ b/compensation/admin.py @@ -148,7 +148,7 @@ class CompensationActionAdmin(admin.ModelAdmin): admin.site.register(Compensation, CompensationAdmin) admin.site.register(EcoAccount, EcoAccountAdmin) -admin.site.register(EcoAccountDeduction, EcoAccountDeductionAdmin) +#admin.site.register(EcoAccountDeduction, EcoAccountDeductionAdmin) # For a more cleaner admin interface these rarely used admin views are not important for deployment #admin.site.register(Payment, PaymentAdmin) diff --git a/ema/admin.py b/ema/admin.py index dbfff3a..8a2b057 100644 --- a/ema/admin.py +++ b/ema/admin.py @@ -16,4 +16,5 @@ class EmaAdmin(AbstractCompensationAdmin): "teams", ] + admin.site.register(Ema, EmaAdmin) diff --git a/konova/admin.py b/konova/admin.py index ff82ac2..07d692d 100644 --- a/konova/admin.py +++ b/konova/admin.py @@ -151,7 +151,7 @@ class ResubmissionAdmin(BaseResourceAdmin): # Outcommented for a cleaner admin backend on production -admin.site.register(Geometry, GeometryAdmin) +#admin.site.register(Geometry, GeometryAdmin) #admin.site.register(Parcel, ParcelAdmin) #admin.site.register(District, DistrictAdmin) #admin.site.register(Municipal, MunicipalAdmin) diff --git a/news/admin.py b/news/admin.py index cada8c4..69f0135 100644 --- a/news/admin.py +++ b/news/admin.py @@ -17,6 +17,9 @@ class ServerMessageAdmin(admin.ModelAdmin): search_fields = [ "subject" ] + ordering = [ + "-publish_on" + ] def save_model(self, request, obj, form, change): obj.save(user=request.user) From d4edb00a124fc84ac784b9fc06d622db6a3cb3c9 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 12 Apr 2024 07:43:07 +0200 Subject: [PATCH 3/4] # Requirements update * updates requirements.txt --- requirements.txt | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index fa809b9..67448d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,33 +1,34 @@ amqp==5.2.0 -asgiref==3.7.2 +asgiref==3.8.1 async-timeout==4.0.3 -beautifulsoup4==4.12.3 +beautifulsoup4==4.13.0b2 billiard==4.2.0 cached-property==1.5.2 -celery==5.3.6 +celery==5.4.0rc2 certifi==2024.2.2 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 click-plugins==1.1.1 click-repl==0.3.0 -coverage==7.3.3 +coverage==7.4.4 Deprecated==1.2.14 -Django==5.0.3 +Django==5.0.4 django-autocomplete-light==3.11.0 django-bootstrap-modal-forms==3.0.4 django-bootstrap4==24.1 -django-debug-toolbar==4.2.0 -django-filter==24.1 +django-debug-toolbar==4.3.0 +django-environ==0.11.2 +django-filter==24.2 django-fontawesome-5==1.0.18 django-simple-sso==1.2.0 django-tables2==2.7.0 et-xmlfile==1.1.0 -idna==3.6 -importlib_metadata==7.0.2 +idna==3.7 +importlib_metadata==7.1.0 itsdangerous==0.24 -kombu==5.3.5 +kombu==5.3.7 openpyxl==3.2.0b1 packaging==24.0 pika==1.3.2 @@ -41,17 +42,17 @@ python-dateutil==2.9.0.post0 pytz==2024.1 PyYAML==6.0.1 qrcode==7.3.1 -redis==5.1.0a1 +redis==5.1.0b4 requests==2.31.0 six==1.16.0 soupsieve==2.5 sqlparse==0.4.4 -typing_extensions==4.10.0 +typing_extensions==4.11.0 tzdata==2024.1 urllib3==2.2.1 vine==5.1.0 -wcwidth==0.2.12 +wcwidth==0.2.13 webservices==0.7 wrapt==1.16.0 xmltodict==0.13.0 -zipp==3.17.0 +zipp==3.18.1 From 34d53b0bc6874a2710f7e966ac39fa0379cec13f Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 12 Apr 2024 07:50:15 +0200 Subject: [PATCH 4/4] # Itsdangerous update * adds itsdangerous package update --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67448d4..75ea07c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ django-tables2==2.7.0 et-xmlfile==1.1.0 idna==3.7 importlib_metadata==7.1.0 -itsdangerous==0.24 +itsdangerous==2.1.2 kombu==5.3.7 openpyxl==3.2.0b1 packaging==24.0