Merge pull request #79 from HackAssistant/fixes

Fixed issues

Author: Casassarnau

Diff for: app/mixins.py

@@ -108,7 +108,8 @@ def get_fields(self):
                 if name in api_fields:
                     field['api'] = api_fields[name]
                     if field['api'].get('restrict', False):
-                        field['field'].help_text += _("Please select one of the dropdown options or write 'Others'.")
+                        field['field'].help_text += _("Please select one of the autocomplete options "
+                                                      "or write 'Others'.")
                 if not visible[field['field'].auto_id]:
                     del visible[field['field'].auto_id]
             list_fields['visible'] = visible

Diff for: app/tables.py

@@ -0,0 +1,12 @@
+import django_tables2 as tables
+
+
+class FloatColumn(tables.Column):
+    def __init__(self, float_digits=None, *args, **kwargs):
+        self.float_digits = float_digits
+        super().__init__(*args, **kwargs)
+
+    def render(self, value):
+        if isinstance(value, float) and self.float_digits is not None:
+            value = round(value, self.float_digits)
+        return value

Diff for: app/templates/components/bootstrap5_form.html

@@ -63,7 +63,7 @@
                                         field.removeClass('is-valid').addClass('is-invalid')
                                         let div_field = $('.mb-3').has('#{{ field.field.auto_id }}')
                                         div_field.find('.valid-feedback, .invalid-feedback').remove()
-                                        field.after('<div class="invalid-feedback">{% translate 'Please select one of the dropdown options or write: Others' %}.</div>')
+                                        field.after('<div class="invalid-feedback">{% translate 'Please select one of the autocomplete options or write: Others' %}.</div>')
                                         $([document.documentElement, document.body]).animate({
                                             scrollTop: div_field.offset().top
                                         }, 100)

Diff for: application/forms/base.py

@@ -122,8 +122,6 @@ class Meta:
             'gender': _('This is for demographic purposes. You can skip this question if you want.'),
             'other_diet': _('Please fill here in your dietary requirements. '
                             'We want to make sure we have food for you!'),
-            'origin': "Please select one of the dropdown options or write 'Others'. If the dropdown doesn't show up,"
-                      " type following this schema: <strong>city, nation, country</strong>"
         }
         labels = {
             'gender': _('What gender do you identify as?'),

Diff for: application/templates/application_form.html

@@ -4,7 +4,7 @@
 {% load perms %}
 {% block subtitle %}{% if edit %}{% blocktrans %}{{ full_name }}'s {{ application_type }} application{% endblocktrans %}{% else %}{% blocktrans %}Applying as {{ application_type }}{% endblocktrans %}{% endif %}{% endblock %}
 {% block content %}
-    {% if edit or public %}
+    {% if request.user.is_authenticated %}
         <div class="row justify-content-between mb-3">
             <div class="col-12 col-lg-2 d-grid d-md-block">
                 <a href="{% if request.user.is_organizer and edit %}{% url 'application_detail' application_form.instance.get_uuid %}{% else %}{% url 'apply_home' %}{% endif %}" class="btn btn-secondary col-12"><i class="bi bi-caret-left-fill"></i> {% trans 'Back' %}</a>

Diff for: requirements.txt

@@ -8,7 +8,7 @@ cryptography==38.0.3
 defusedxml==0.7.1
 Deprecated==1.2.13
 Django==4.0.8
-django-admin-honeypot @ https://github.com/dmpayton/django-admin-honeypot/archive/refs/heads/develop.zip
+django-admin-honeypot @ https://github.com/dmpayton/django-admin-honeypot/archive/a840496d183df89965eeb33c9a5dd9ea3919dfff.zip
 django-allauth==0.51.0
 django-appconf==1.0.5
 django-axes==5.39.0

Diff for: review/tables.py

@@ -1,6 +1,7 @@
 import django_tables2 as tables
 from django.db.models import Avg, F, Count
 
+from app.tables import FloatColumn
 from application.models import Application
 
 
@@ -11,8 +12,8 @@ class ApplicationTable(tables.Table):
     last_modified = tables.TemplateColumn(template_code='{{ record.last_modified|timesince }}',
                                           order_by='last_modified')
     votes = tables.Column(accessor='vote_count', verbose_name='Votes')
-
     status = tables.TemplateColumn(template_name='tables/status.html')
+    vote_avg = FloatColumn(float_digits=3)
 
     @staticmethod
     def get_queryset(queryset):

Diff for: review/templates/application_detail.html

@@ -43,34 +43,34 @@ <h1 {% if application.user.under_age %}class="text-danger"{% endif %}>{% if vote
                     </div>
                 {% endif %}
                 <div class="row">
-                    <div class="col-lg-3 fw-bold pb-3 text-lg-end">{% translate 'Full name' %}</div>
-                    <div class="col-lg-9 pb-3">{{ application.user.get_full_name }}</div>
+                    <div class="col-lg-3 fw-bold pb-3 text-lg-end text-break">{% translate 'Full name' %}</div>
+                    <div class="col-lg-9 pb-3 text-break">{{ application.user.get_full_name }}</div>
                 </div>
                 {% if not vote %}
                     <div class="row">
-                        <div class="col-lg-3 fw-bold pb-3 text-lg-end">{% translate 'Email' %}</div>
-                        <div class="col-lg-9 pb-3">{{ application.user.email }}</div>
+                        <div class="col-lg-3 fw-bold pb-3 text-lg-end text-break">{% translate 'Email' %}</div>
+                        <div class="col-lg-9 pb-3 text-break">{{ application.user.email }}</div>
                     </div>
                 {% endif %}
                 <div class="row">
-                    <div class="col-lg-3 fw-bold pb-3 text-lg-end">{% translate 'Status' %}</div>
-                    <div class="col-lg-9 pb-3">
+                    <div class="col-lg-3 fw-bold pb-3 text-lg-end text-break">{% translate 'Status' %}</div>
+                    <div class="col-lg-9 pb-3 text-break">
                         {% include 'tables/status.html' with record=application %}
                     </div>
                 </div>
                 {% if application.promotional_code %}
                     <div class="row">
-                        <div class="col-lg-3 fw-bold pb-3 text-lg-end">{% translate 'Promotion' %}</div>
-                        <div class="col-lg-9 pb-3">
+                        <div class="col-lg-3 fw-bold pb-3 text-lg-end text-break">{% translate 'Promotion' %}</div>
+                        <div class="col-lg-9 pb-3 text-break">
                             {% include 'tables/promotional_code.html' with record=application %}
                         </div>
                     </div>
                 {% endif %}
                 {% for name, data in details.items %}
                     {% if name not in icons.keys and data != '' %}
                         <div class="row">
-                            <div class="col-lg-3 fw-bold pb-3 text-lg-end">{{ name }}</div>
-                            <div class="col-lg-9 pb-3">{{ data }}</div>
+                            <div class="col-lg-3 fw-bold pb-3 text-lg-end text-break">{{ name }}</div>
+                            <div class="col-lg-9 pb-3 text-break">{{ data }}</div>
                         </div>
                     {% endif %}
                 {% endfor %}

Diff for: user/forms.py

@@ -42,7 +42,7 @@ class LoginForm(BootstrapFormMixin, forms.Form):
     bootstrap_field_info = {'': {'fields': [{'name': 'email', 'space': 12}, {'name': 'password', 'space': 12}]}}
 
     email = forms.EmailField(label=_('Email'), max_length=100)
-    password = forms.CharField(widget=forms.PasswordInput, label=_('Password'), max_length=100)
+    password = forms.CharField(widget=forms.PasswordInput, label=_('Password'), max_length=128)
 
     def clean_email(self):
         email = self.cleaned_data.get('email')
@@ -61,8 +61,8 @@ class UserCreationForm(BootstrapFormMixin, forms.ModelForm):
                                             {'name': 'email', 'space': 12}, {'name': 'password1', 'space': 12},
                                             {'name': 'password2', 'space': 12}]}}
 
-    password1 = forms.CharField(label=_('Password'), widget=forms.PasswordInput)
-    password2 = forms.CharField(label=_('Password confirmation'), widget=forms.PasswordInput,
+    password1 = forms.CharField(label=_('Password'), widget=forms.PasswordInput, max_length=128)
+    password2 = forms.CharField(label=_('Password confirmation'), widget=forms.PasswordInput, max_length=128,
                                 help_text=password_validation.password_validators_help_text_html())
 
     class Meta:
@@ -196,8 +196,6 @@ class Meta:
             'gender': _('This is for demographic purposes. You can skip this question if you want.'),
             'other_diet': _('Please fill here in your dietary requirements. '
                             'We want to make sure we have food for you!'),
-            'origin': "Please select one of the dropdown options or write 'Others'. If the dropdown doesn't show up,"
-                      " type following this schema: <strong>city, nation, country</strong>"
         }
         labels = {
             'gender': _('What gender do you identify as?'),

Diff for: user/views.py

@@ -77,9 +77,14 @@ class Login(AuthTemplateViews):
     def add_axes_context(self, context):
         if not AxesProxyHandler.is_allowed(self.request):
             ip_address = get_client_ip_address(self.request)
-            attempt = AccessAttempt.objects.get(ip_address=ip_address)
-            time_left = (attempt.attempt_time + get_cool_off()) - timezone.now()
-            minutes_left = int((time_left.total_seconds() + 59) // 60)
+            attempt = AccessAttempt.objects\
+                .filter(ip_address=ip_address, failures_since_start__gte=getattr(settings, 'AXES_FAILURE_LIMIT'))\
+                .first()
+            if attempt is not None:
+                time_left = (attempt.attempt_time + get_cool_off()) - timezone.now()
+                minutes_left = int((time_left.total_seconds() + 59) // 60)
+            else:
+                minutes_left = 5
             axes_error_message = _('Too many login attempts. Please try again in %s minutes.') % minutes_left
             context.update({'blocked_message': axes_error_message})