Merge branch 'ruff-life' of github.com:eevelweezel/chipy.org into ruf…

…f-life

chipy_org/apps/announcements/admin.py

@@ -1,9 +1,18 @@
+from django import forms
 from django.contrib import admin
+from tinymce.widgets import TinyMCE
 
 from .models import Announcement
 
 
+class CustomAnnoucementForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["text"].widget = TinyMCE()
+
+
 class AnnouncementAdmin(admin.ModelAdmin):
+    form = CustomAnnoucementForm     
     list_display = ["id", "active", "end_date", "headline", "created"]
     search_fields = [
         "id",

chipy_org/apps/announcements/migrations/0001_initial_squashed_0005_remove_announcement_text.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.1.3 on 2024-11-21 17:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    replaces = [
+        ("announcements", "0001_initial"),
+        ("announcements", "0002_announcement_end_date"),
+        ("announcements", "0003_announcement_text2"),
+        ("announcements", "0004_move_ckeditor_data_to_field"),
+        ("announcements", "0005_remove_announcement_text"),
+    ]
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Announcement",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("modified", models.DateTimeField(auto_now=True)),
+                ("headline", models.TextField(max_length="100")),
+                (
+                    "active",
+                    models.BooleanField(
+                        default=True, help_text="Has this announcement been published yet?"
+                    ),
+                ),
+                ("photo", models.ImageField(blank=True, null=True, upload_to="announcements")),
+                ("link", models.URLField(blank=True, null=True)),
+                ("end_date", models.DateTimeField(blank=True, null=True)),
+                ("text2", models.TextField(blank=True, null=True)),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]

chipy_org/apps/announcements/migrations/0006_rename_text2_announcement_text.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2024-11-23 14:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("announcements", "0001_initial_squashed_0005_remove_announcement_text"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="announcement",
+            old_name="text2",
+            new_name="text",
+        ),
+    ]

chipy_org/apps/announcements/models.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-from ckeditor.fields import RichTextField
 from django.db import models
 from django.utils import timezone
 
@@ -26,7 +25,7 @@ def featured(self):
 
 class Announcement(CommonModel):
     headline = models.TextField(max_length="100")
-    text = RichTextField(blank=True, null=True)
+    text = models.TextField(blank=True, null=True)
     end_date = models.DateTimeField(blank=True, null=True)
     active = models.BooleanField(
         default=True, help_text="Has this announcement been published yet?"

chipy_org/apps/main/admin.py

@@ -1,16 +1,16 @@
-from ckeditor.widgets import CKEditorWidget
 from django import forms
 from django.contrib import admin
 from django.contrib.flatpages.admin import FlatPageAdmin, FlatpageForm
 from django.contrib.flatpages.models import FlatPage
 from flatblocks.admin import FlatBlockAdmin
 from flatblocks.models import FlatBlock
+from tinymce.widgets import TinyMCE
 
 
 class CustomFlatpageForm(FlatpageForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["content"].widget = CKEditorWidget()
+        self.fields["content"].widget = TinyMCE()
 
 
 class CustomFlatPageAdmin(FlatPageAdmin):
@@ -24,7 +24,7 @@ class CustomFlatPageAdmin(FlatPageAdmin):
 class CustomFlatBlockForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["content"].widget = CKEditorWidget()
+        self.fields["content"].widget = TinyMCE()
 
 
 class CustomFlatBlockAdmin(FlatBlockAdmin):

chipy_org/apps/meetings/admin.py

@@ -1,12 +1,12 @@
 import random
 import string
 
-from ckeditor.widgets import CKEditorWidget
 from django import forms
 from django.contrib import admin
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
+from tinymce.widgets import TinyMCE
 
 from chipy_org.apps.sponsors.admin import MeetingSponsorInline
 
@@ -28,11 +28,17 @@ class TopicInline(admin.StackedInline):
     ]
     extra = 0
 
+    def formfield_for_dbfield(self, db_field, **kwargs):
+        if db_field.name == 'description':
+            kwargs['widget'] = TinyMCE()
+        return super().formfield_for_dbfield(db_field,**kwargs)
+
 
 class CustomTopicForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["description"].widget = CKEditorWidget()
+    class Meta:
+        model=Topic
+        widgets = {"description": TinyMCE()}
+        exclude = []
 
 
 class TopicAdmin(admin.ModelAdmin):
@@ -86,18 +92,14 @@ def get_presenters(self, obj):
 
 
 class MeetingForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.fields["meetup_id"].widget = admin.widgets.AdminTextInputWidget()
-
     def clean_key(self):
         if not self.cleaned_data["key"]:
             return "".join(random.choice(string.digits + string.ascii_lowercase) for x in range(40))
         return self.cleaned_data["key"]
 
     class Meta:
         model = Meeting
+        widgets = {'description': TinyMCE(), "metup_id":admin.widgets.AdminTextInputWidget()}
         exclude = []  # pylint: disable=modelform-uses-exclude
 
 
@@ -169,8 +171,12 @@ class RSVPAdmin(admin.ModelAdmin):
         "status",
     ]
 
-
+class MeetingTypeForm(forms.ModelForm):
+    class Meta:
+        widgets = {'description': TinyMCE()}
+
 class MeetingTypeAdmin(admin.ModelAdmin):
+    form = MeetingTypeForm
     list_display = ["id", "name", "slug"]
     prepopulated_fields = {"slug": ("name",)}