Merge branch 'main' into dependabot/pip/pillow-9.3.0

Author: euribates

.github/workflows/ci.yml

@@ -16,4 +16,4 @@ jobs:
           host: pythoncanarias.es
           username: ${{ secrets.PRODUCTION_SSH_USERNAME }}
           key: ${{ secrets.PRODUCTION_SSH_KEY }}
-          script: source ~/.virtualenvs/web/bin/activate && cd ~/web && ./deploy.sh
+          script: source ~/.pyenv/versions/pycanweb/bin/activate && cd ~/web && ./deploy.sh

__init__.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.25 on 2025-02-17 08:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('about', '0004_auto_20220510_2236'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ally',
+            options={'ordering': ['name'], 'verbose_name': 'Aliado', 'verbose_name_plural': 'Aliados'},
+        ),
+    ]

apps/about/migrations/0005_alter_ally_options.py

@@ -16,6 +16,8 @@ def __str__(self):
 
     class Meta:
         ordering = ['name']
+        verbose_name = 'Aliado'
+        verbose_name_plural = 'Aliados'
 
 
 class FAQItem(models.Model):

apps/about/models.py

@@ -50,7 +50,8 @@
       Asociación cultural {{ organization.name }}<br>
       CIF {{ organization.cif }}<br>
       {{ organization.address }}<br>
-      {{ organization.postal_code }} {{ organization.city }}
+      {{ organization.postal_code }} {{ organization.city }}<br>
+      {{ organization.phone }}
     </p>
 
     <p>

apps/about/templates/about/index.html

@@ -2,8 +2,8 @@
 
 from django.core.management.base import BaseCommand
 
-from certificates.utils import create_certificate
-from tickets.models import Ticket
+from apps.certificates.utils import create_certificate
+from apps.tickets.models import Ticket
 
 
 class Command(BaseCommand):

apps/certificates/management/commands/create_certificate.py

@@ -1,6 +1,7 @@
 import json
 import os
 
+from django.utils import timezone
 from django.conf import settings
 
 from apps.organizations.models import Organization
@@ -22,3 +23,19 @@ def glob(request):
 
 def main_organization_data(request):
     return dict(organization=Organization.load_main_organization())
+
+
+def global_data(request):
+    """Añade al contexto datos de uso general.
+
+    Agrega los datos de:
+
+    - La fecha actual
+    - El valor DEBUG definido en el `settings.py`.
+    """
+    now = timezone.now()
+    hoy = now.date()
+    return {
+        'current_date': hoy,
+        'DEBUG': settings.DEBUG,
+        }

apps/commons/context_processors.py

@@ -58,7 +58,11 @@
   {% include "footer.html" %}
 
   <script src="{{ assets|get_asset_key:'commons/custom.min.js' }}"></script>
-  {% block js %}{% endblock %}
+  {% block js %}
+    {% if current_date.month == 12 and current_date.day >= 21 and current_date.day <= 31  %}
+      <script src="https://app.embed.im/snow.js" defer></script>
+    {% endif %}
+  {% endblock %}
 
 </body>
 </html>

apps/commons/templates/base.html

@@ -28,6 +28,7 @@ <h2 class="subtitle"><i class="fas fa-copyright"></i> {{ organization.name }}</h
           <li>{{ organization.rest_address }}</li>
           {% endif %}
           <li>{{ organization.postal_code }}, {{ organization.city }}</li>
+          <li>{{ organization.phone }}</li>
           <li><a href="mailto:{{ organization.email }}">{{ organization.email }}</a></li>
           <li><a href="{% url 'about:index' %}">Sobre la asociación</a></li>
         </ul>

apps/commons/templates/footer.html

@@ -15,6 +15,7 @@
 {% endblock style %}
 
 {% block js %}
+  {{ block.super }}
   <script src="{{ assets|get_asset_key:'events/custom.min.js' }}"></script>
 
   {% leaflet_js %}