Merge branch 'main' into upload-ty-notes-to-sf

books/models.py

@@ -1010,9 +1010,6 @@ def book_urls(self):
         return book_urls
 
     def save(self, *args, **kwargs):
-        if self.cnx_id:
-            self.webview_link = '{}contents/{}'.format(settings.CNX_URL, self.cnx_id)
-
         if self.partner_list_label:
             Book.objects.filter(locale=self.locale).update(partner_list_label=self.partner_list_label)
 
@@ -1059,7 +1056,7 @@ def get_url_parts(self, *args, **kwargs):
             return None
 
         site_id, site_root_url, page_url_relative_to_site_root = url_parts
-        return (site_id, site_root_url, '/details/books/{}'.format(self.slug))
+        return site_id, site_root_url, '/details/books/{}'.format(self.slug)
 
     def __str__(self):
         return self.book_title

webinars/migrations/0006_alter_webinar_spaces_remaining.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2025-01-08 16:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("webinars", "0005_webinar_webinar_collections"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="webinar",
+            name="spaces_remaining",
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+    ]

webinars/models.py

@@ -45,7 +45,7 @@ class Webinar(models.Model):
     title = models.CharField(max_length=255)
     description = models.TextField()
     speakers = models.CharField(max_length=255)
-    spaces_remaining = models.PositiveIntegerField()
+    spaces_remaining = models.PositiveIntegerField(blank=True, null=True)
     registration_url = models.URLField()
     registration_link_text = models.CharField(max_length=255)
     display_on_tutor_page = models.BooleanField(default=False)