From c3284a77f353e6291836df972f7159ea73ff2b1a Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Wed, 26 Jan 2022 14:42:42 +0100 Subject: [PATCH] Lots of various fixes --- app/local_settings.py | 2 - app/settings.py | 5 +- teleforma/admin.py | 2 + teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 36444 -> 36826 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 8 +- .../commands/teleforma-export-avis.py | 14 +- .../migrations/0005_auto_20220117_1756.py | 23 +++ teleforma/models/core.py | 10 +- teleforma/models/pro.py | 4 +- teleforma/static/teleforma/css/teleforma.css | 1 + .../seminarrevision/change_list.html | 136 ------------------ .../registration/password_reset_email.html | 2 +- teleforma/templatetags/teleforma_tags.py | 2 +- teleforma/urls.py | 3 +- teleforma/views/ae.py | 2 +- teleforma/views/pro.py | 2 +- 16 files changed, 53 insertions(+), 163 deletions(-) create mode 100644 teleforma/migrations/0005_auto_20220117_1756.py delete mode 100644 teleforma/templates/admin/teleforma/seminarrevision/change_list.html diff --git a/app/local_settings.py b/app/local_settings.py index 7ef9b870..b7b86de9 100644 --- a/app/local_settings.py +++ b/app/local_settings.py @@ -1,6 +1,4 @@ -DEBUG_TOOLBAR = True - EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' # EMAIL_HOST = 'smtp.pilotsystems.net' diff --git a/app/settings.py b/app/settings.py index d34b56de..4c55374b 100644 --- a/app/settings.py +++ b/app/settings.py @@ -17,10 +17,8 @@ TEMPLATE_DEBUG = DEBUG RECOVERY = True -# disable to debug websocket and improve performance DEBUG_TOOLBAR = False - BASE_DIR = os.path.dirname(os.path.dirname(__file__)) warnings.showwarning = lambda *x: None @@ -156,6 +154,7 @@ MIDDLEWARE = (('debug_toolbar.middleware.DebugToolbarMiddleware',) if DEBUG_TOOL 'django_user_agents.middleware.UserAgentMiddleware', 'mezzanine.core.middleware.SitePermissionMiddleware' ) +print(MIDDLEWARE) ROOT_URLCONF = 'urls' @@ -247,7 +246,7 @@ POSTMAN_DISALLOW_ANONYMOUS = True TELEFORMA_ORGANIZATION = 'Pro-Barreau' TELEFORMA_SUBJECTS = ('Barreau', 'e-learning') TELEFORMA_DESCRIPTION = "E-learning Pro-Barreau" -TELEFORMA_E_LEARNING_TYPE = 'Pro-Barreau' +TELEFORMA_E_LEARNING_TYPE = 'AE' EMAIL_HOST = 'angus.parisson.com' DEFAULT_FROM_EMAIL = 'e-learning@pro-barreau.com' diff --git a/teleforma/admin.py b/teleforma/admin.py index 24328104..35563c08 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -306,6 +306,8 @@ class AnswerAdmin(admin.ModelAdmin): class SeminarRevisionAdmin(admin.ModelAdmin): search_fields = ['user__username', 'seminar__title'] date_hierarchy = 'date_modified' + readonly_fields=('date',) + actions = ['export_seminar_revisions'] diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index b48f76f560fcb0e948b8a6fd3616e698a0a75f14..4027046e958be6616d473d3a1177e2f7f13b1f79 100644 GIT binary patch delta 12528 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 delta 12142 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 - {% if cl.formset %} - {# #} - {% endif %} - {% if cl.formset or action_form %} - {% url 'admin:jsi18n' as jsi18nurl %} - - {% endif %} - {{ media.css }} - {% if not actions_on_top and not actions_on_bottom %} - - {% endif %} -{% endblock %} - -{% block extrahead %} - {{ block.super }} - {{ media.js }} - {% if action_form %}{% if actions_on_top or actions_on_bottom %} - - {% endif %}{% endif %} -{% endblock %} - -{% block bodyclass %}change-list{% endblock %} - -{% if not is_popup %} - {% block breadcrumbs %} - - {% endblock %} -{% endif %} - -{% block coltype %}flex{% endblock %} - -{% block content %} - -
- -
-
- -
- {% block object-tools %} - {% if has_add_permission %} -
- {% block object-tools-items %} - -   - {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %} - - {% endblock %} -
- {% endif %} - {% endblock %} - - {% block search %}{% search_form cl %}{% endblock %} -
- - {% block date_hierarchy %} - {% if cl.date_hierarchy %} - {% date_hierarchy cl %} - {% endif %} - {% endblock %} - - {% if cl.formset.errors %} -
- {% blocktrans count cl.formset.errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} -
- {{ cl.formset.non_form_errors }} - {% endif %} - -
{% csrf_token %} - {% if cl.formset %} -
{{ cl.formset.management_form }}
- {% endif %} - - {% block result_list %} - {% if cl.result_count %} - {% if action_form and actions_on_top and cl.full_result_count %} - {% admin_actions %}{% endif %} - {% result_list_with_context cl %} - - {% if action_form and actions_on_bottom and cl.full_result_count %} - {% admin_actions %}{% endif %} - {% else %} - {% suit_bc_value 1.5 'pop' 1.6 '_popup' as POPUP_VAR %} -
- {% if cl.full_result_count %} -

{% trans 'Nothing found' %}!

-
- {% trans 'Reset search and filters' %} - {% else %} - {% blocktrans with cl.opts.verbose_name_plural|capfirst as name_plural %}{{ name_plural }} are not created yet{% endblocktrans %}. - {% if has_add_permission %} - {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}{% endif %} - {% endif %} -
- {% endif %} - {% endblock %} - - {% block pagination %} - {% if cl.result_count %} - {% if action_form and actions_on_bottom and cl.full_result_count %} -
- {% endif %} - {% pagination cl %} - {% if action_form and actions_on_bottom and cl.full_result_count %} -
- {% endif %} - {% endif %} - {% endblock %} -
-
-
-
-{% endblock %} diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/registration/password_reset_email.html index 5bf161f6..715e4fa9 100644 --- a/teleforma/templates/registration/password_reset_email.html +++ b/teleforma/templates/registration/password_reset_email.html @@ -5,7 +5,7 @@ {% trans "Please go to the following page and choose a new password:" %} {% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'teleforma-password-reset-confirm' uidb36=uid token=token %} +{{ protocol }}://{{ domain }}{% url 'teleforma-password-reset-confirm' uidb64=uid token=token %} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.username }} diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index 7d47c916..887a16d0 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -322,7 +322,7 @@ def fancy_duration_shop_like(duration): def fancy_seconds(seconds): time = '' hours = int(seconds / 3600) - minutes_int = (seconds % 3600) / 60 + minutes_int = int((seconds % 3600) / 60) if hours: if minutes_int: time += str(hours) + 'h' diff --git a/teleforma/urls.py b/teleforma/urls.py index 32eaed73..b0de2608 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -34,6 +34,7 @@ import os.path from django.conf.urls import url, include +from django.urls import path from jsonrpc import jsonrpc_site from django.contrib.auth.views import (LoginView, LogoutView, PasswordChangeDoneView, @@ -83,7 +84,7 @@ urlpatterns = [ email_template_name='registration/password_reset_email.html'), name="teleforma-password-reset"), url(r'^accounts/password_reset_done/$', PasswordResetDoneView.as_view( template_name='registration/password_reset_done.html'), name="password_reset_done"), - url(r'accounts/password_reset_confirm///', PasswordResetConfirmView.as_view( + path('accounts/password_reset_confirm///', PasswordResetConfirmView.as_view( template_name='registration/password_reset_confirm.html'), name="teleforma-password-reset-confirm"), url(r'^accounts/password_reset_complete/$', PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), name="password_reset_complete"), diff --git a/teleforma/views/ae.py b/teleforma/views/ae.py index e5dba088..6323e258 100644 --- a/teleforma/views/ae.py +++ b/teleforma/views/ae.py @@ -83,6 +83,6 @@ def get_ae_courses(user, date_order=False, num_order=False): if date_order: courses = sorted(courses, key=lambda k: k['date'], reverse=True) if num_order: - courses = sorted(courses, key=lambda k: k['number']) + courses = sorted(courses, key=lambda k: k['number'] or 0) return courses diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 959d099b..077549f5 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -168,7 +168,7 @@ class SeminarRevisionMixin(object): all_revisions = SeminarRevision.objects.filter( user=user, date__gte=REVISION_DATE_FILTER, date_modified=None) now = datetime.datetime.now() - if seminar.expiry_date < now: + if not seminar.expiry_date or seminar.expiry_date < now: return if all_revisions: if not all_revisions[0].seminar == seminar: -- 2.39.5