Django backwards compatability + missing migrations

farridav · Mar 27, 2022 · 9cd2702 · 9cd2702
1 parent 502e9c6
commit 9cd2702
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -37,3 +37,6 @@ test_app: check-venv ## Run the test app
 	@printf "$(CYAN)Running test app$(COFF)\n"
 	$(environment) python tests/test_app/manage.py migrate
 	$(environment) python tests/test_app/manage.py runserver_plus
+
+test_user:  ## Make the test user
+	$(environment) python tests/test_app/manage.py shell -c "from django.contrib.auth.models import User; User.objects.create_superuser('test@test.com', password='test')"
diff --git a/jazzmin/templates/registration/password_reset_complete.html b/jazzmin/templates/registration/password_reset_complete.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 
 {% block content %}
-    <p class="login-box-msg">{% translate "Your password has been set.  You may go ahead and log in now." %}</p>
+    <p class="login-box-msg">{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
     <div class="row">
         <div class="col-12">
             <a href="{{ login_url }}">
-                <button class="btn {{ jazzmin_ui.button_classes.primary }} btn-block">{% translate 'Log in' %}</button>
+                <button class="btn {{ jazzmin_ui.button_classes.primary }} btn-block">{% trans 'Log in' %}</button>
             </a>
         </div>
     </div>

diff --git a/jazzmin/templates/registration/password_reset_confirm.html b/jazzmin/templates/registration/password_reset_confirm.html
@@ -5,7 +5,7 @@
 {% block content %}
     {% if validlink %}
         <p class="login-box-msg">
-            {% translate "Please enter your new password twice so we can verify you typed it in correctly." %}
+            {% trans "Please enter your new password twice so we can verify you typed it in correctly." %}
         </p>
         <form method="post">{% csrf_token %}
             {% if form.errors %}
@@ -47,14 +47,14 @@
             <div class="row">
                 <div class="col-12">
                     <button type="submit" class="btn {{ jazzmin_ui.button_classes.primary }} btn-block">
-                        {% translate 'Change my password' %}
+                        {% trans 'Change my password' %}
                     </button>
                 </div>
             </div>
         </form>
     {% else %}
         <p>
-            {% translate "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}
+            {% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}
         </p>
     {% endif %}
 {% endblock %}
diff --git a/jazzmin/templates/registration/password_reset_form.html b/jazzmin/templates/registration/password_reset_form.html
@@ -38,7 +38,7 @@
         <div class="row">
             <div class="col-12">
                 <button type="submit" class="btn {{ jazzmin_ui.button_classes.primary }} btn-block">
-                    {% translate 'Reset my password' %}
+                    {% trans 'Reset my password' %}
                 </button>
             </div>
         </div>

diff --git a/tests/test_app/library/books/migrations/0006_auto_20220327_0814.py b/tests/test_app/library/books/migrations/0006_auto_20220327_0814.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.12 on 2022-03-27 07:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("books", "0005_book_last_print"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="author",
+            name="id",
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID"),
+        ),
+        migrations.AlterField(
+            model_name="book",
+            name="id",
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID"),
+        ),
+        migrations.AlterField(
+            model_name="genre",
+            name="id",
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID"),
+        ),
+    ]
diff --git a/tests/test_app/library/loans/migrations/0003_alter_library_id.py b/tests/test_app/library/loans/migrations/0003_alter_library_id.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-03-27 07:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("loans", "0002_auto_20201015_1222"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="library",
+            name="id",
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID"),
+        ),
+    ]
diff --git a/tests/test_app/library/settings.py b/tests/test_app/library/settings.py
@@ -103,6 +103,8 @@
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
+EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+
 if DEBUG and not TEST:
     os.environ.setdefault("WERKZEUG_DEBUG_PIN", "off")
     INSTALLED_APPS.extend(["debug_toolbar", "django_extensions"])

diff --git a/tests/test_app/library/urls.py b/tests/test_app/library/urls.py
@@ -3,17 +3,10 @@
 from django.contrib import admin, messages
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponseRedirect
-from django.urls import path, re_path, reverse
+from django.urls import include, path, re_path, reverse
 from django.views.generic import RedirectView
 from django.views.static import serve
 
-try:
-    from django.urls import include, path
-except ImportError:
-    from django.conf.urls import include, path
-except ImportError:
-    from django.conf.urls.defaults import include, path
-
 
 def make_messages(request):
     messages.add_message(request, messages.INFO, "Info message")
@@ -32,37 +25,15 @@ def make_messages(request):
 ]
 
 urlpatterns += i18n_patterns(
-    path(
-        "admin/password_reset/",
-        auth_views.PasswordResetView.as_view(),
-        name="admin_password_reset",
-    ),
-    path(
-        "admin/password_reset/done/",
-        auth_views.PasswordResetDoneView.as_view(),
-        name="password_reset_done",
-    ),
-    path(
-        "reset/<uidb64>/<token>/",
-        auth_views.PasswordResetConfirmView.as_view(),
-        name="password_reset_confirm",
-    ),
-    path(
-        "reset/done/",
-        auth_views.PasswordResetCompleteView.as_view(),
-        name="password_reset_complete",
-    ),
+    path("admin/password_reset/", auth_views.PasswordResetView.as_view(), name="admin_password_reset"),
+    path("admin/password_reset/done/", auth_views.PasswordResetDoneView.as_view(), name="password_reset_done"),
+    path("reset/<uidb64>/<token>/", auth_views.PasswordResetConfirmView.as_view(), name="password_reset_confirm"),
+    path("reset/done/", auth_views.PasswordResetCompleteView.as_view(), name="password_reset_complete"),
     path("admin/", admin.site.urls),
 )
 
 if settings.DEBUG:
-    urlpatterns.append(
-        re_path(
-            r"^static/(?P<path>.*)$",
-            serve,
-            kwargs={"document_root": settings.STATIC_ROOT},
-        )
-    )
+    urlpatterns.append(re_path(r"^static/(?P<path>.*)$", serve, kwargs={"document_root": settings.STATIC_ROOT}))
 
 if "debug_toolbar" in settings.INSTALLED_APPS:
     try: