diff --git a/paste/admin.py b/paste/admin.py index 9d90129..5d5a70c 100644 --- a/paste/admin.py +++ b/paste/admin.py @@ -5,4 +5,4 @@ from .models import Paste @admin.register(Paste) class PasteAdmin(admin.ModelAdmin): - list_display = ("paste_time", "slug", "title", "viewcount") + list_display = ("paste_time", "slug", "viewcount") diff --git a/paste/forms.py b/paste/forms.py index d40e44f..3d88ef9 100644 --- a/paste/forms.py +++ b/paste/forms.py @@ -15,7 +15,6 @@ class PasteForm(ModelForm): model = Paste fields = [ "language", - "title", "content", ] @@ -23,8 +22,6 @@ class PasteForm(ModelForm): """Overwrites save method.""" paste = super(PasteForm, self).save(commit=False) paste.compute_size() - if not self.cleaned_data["title"]: - paste.title = "no title" if commit: paste.save() return paste diff --git a/paste/migrations/0006_remove_paste_title.py b/paste/migrations/0006_remove_paste_title.py new file mode 100644 index 0000000..26672a9 --- /dev/null +++ b/paste/migrations/0006_remove_paste_title.py @@ -0,0 +1,16 @@ +# Generated by Django 4.2 on 2023-04-21 08:16 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("paste", "0005_remove_paste_expired_remove_paste_lifecount_and_more"), + ] + + operations = [ + migrations.RemoveField( + model_name="paste", + name="title", + ), + ] diff --git a/paste/models.py b/paste/models.py index 5b5b139..788e5e8 100644 --- a/paste/models.py +++ b/paste/models.py @@ -46,7 +46,6 @@ class Paste(models.Model): Language, default=14, on_delete=models.SET_NULL, null=True ) slug = models.SlugField(unique=True, editable=False) - title = models.CharField(max_length=200, blank=True) content = models.TextField( validators=[MaxLengthValidator(settings.PASTE["max_characters"])] ) @@ -70,4 +69,4 @@ class Paste(models.Model): def __str__(self): excerpt = repr(self.content[:100]) + ("..." if len(self.content) > 100 else "") - return "{} - {} - {}".format(self.slug, self.title, excerpt) + return f"{self.slug} - {excerpt}" diff --git a/paste/templates/paste/show-pygments.html b/paste/templates/paste/show-pygments.html index 410484d..038f8f2 100644 --- a/paste/templates/paste/show-pygments.html +++ b/paste/templates/paste/show-pygments.html @@ -3,7 +3,7 @@ {% endblock %} -{% block title %}{{ title }}{% endblock %} +{% block title %}{{ slug }}{% endblock %} {% block nav %}{% endblock %} {% block content %} {{ highlighted|safe }} diff --git a/paste/views.py b/paste/views.py index 5d70c9e..41c54f6 100644 --- a/paste/views.py +++ b/paste/views.py @@ -22,7 +22,6 @@ def index(request): form = PasteForm( { "language": language.id, - "title": any_file.name, "lifetime": settings.PASTE["default_lifetime"], "content": any_file.read().decode(), }, @@ -54,7 +53,7 @@ def show(request, slug, renderer="pygments"): """Display paste.""" # Fetching object paste = get_object_or_404(Paste, slug=slug) - data = {"title": paste.title, "slug": slug} + data = {"slug": slug} # Handling expiration # Before rendering actions paste.incr_viewcount() diff --git a/webtools/settings.py b/webtools/settings.py index a662312..fe2aff9 100644 --- a/webtools/settings.py +++ b/webtools/settings.py @@ -91,7 +91,6 @@ INSTALLED_APPS = ( ) PASTE = { - "has_title": False, "has_meta_table": False, "enabled_renderers": ["pygments", "raw"], "default_renderer": "pygments",