Drop title.

This commit is contained in:
Julien Palard 2023-04-21 10:16:25 +02:00
parent 8a5f3d2f14
commit 459d80eab7
Signed by: mdk
GPG Key ID: 0EFC1AC1006886F8
7 changed files with 20 additions and 10 deletions

View File

@ -5,4 +5,4 @@ from .models import Paste
@admin.register(Paste) @admin.register(Paste)
class PasteAdmin(admin.ModelAdmin): class PasteAdmin(admin.ModelAdmin):
list_display = ("paste_time", "slug", "title", "viewcount") list_display = ("paste_time", "slug", "viewcount")

View File

@ -15,7 +15,6 @@ class PasteForm(ModelForm):
model = Paste model = Paste
fields = [ fields = [
"language", "language",
"title",
"content", "content",
] ]
@ -23,8 +22,6 @@ class PasteForm(ModelForm):
"""Overwrites save method.""" """Overwrites save method."""
paste = super(PasteForm, self).save(commit=False) paste = super(PasteForm, self).save(commit=False)
paste.compute_size() paste.compute_size()
if not self.cleaned_data["title"]:
paste.title = "no title"
if commit: if commit:
paste.save() paste.save()
return paste return paste

View File

@ -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",
),
]

View File

@ -46,7 +46,6 @@ class Paste(models.Model):
Language, default=14, on_delete=models.SET_NULL, null=True Language, default=14, on_delete=models.SET_NULL, null=True
) )
slug = models.SlugField(unique=True, editable=False) slug = models.SlugField(unique=True, editable=False)
title = models.CharField(max_length=200, blank=True)
content = models.TextField( content = models.TextField(
validators=[MaxLengthValidator(settings.PASTE["max_characters"])] validators=[MaxLengthValidator(settings.PASTE["max_characters"])]
) )
@ -70,4 +69,4 @@ class Paste(models.Model):
def __str__(self): def __str__(self):
excerpt = repr(self.content[:100]) + ("..." if len(self.content) > 100 else "") excerpt = repr(self.content[:100]) + ("..." if len(self.content) > 100 else "")
return "{} - {} - {}".format(self.slug, self.title, excerpt) return f"{self.slug} - {excerpt}"

View File

@ -3,7 +3,7 @@
<link href="/static/css//pasteque.css" rel="stylesheet"> <link href="/static/css//pasteque.css" rel="stylesheet">
{% endblock %} {% endblock %}
{% block title %}{{ title }}{% endblock %} {% block title %}{{ slug }}{% endblock %}
{% block nav %}{% endblock %} {% block nav %}{% endblock %}
{% block content %} {% block content %}
{{ highlighted|safe }} {{ highlighted|safe }}

View File

@ -22,7 +22,6 @@ def index(request):
form = PasteForm( form = PasteForm(
{ {
"language": language.id, "language": language.id,
"title": any_file.name,
"lifetime": settings.PASTE["default_lifetime"], "lifetime": settings.PASTE["default_lifetime"],
"content": any_file.read().decode(), "content": any_file.read().decode(),
}, },
@ -54,7 +53,7 @@ def show(request, slug, renderer="pygments"):
"""Display paste.""" """Display paste."""
# Fetching object # Fetching object
paste = get_object_or_404(Paste, slug=slug) paste = get_object_or_404(Paste, slug=slug)
data = {"title": paste.title, "slug": slug} data = {"slug": slug}
# Handling expiration # Handling expiration
# Before rendering actions # Before rendering actions
paste.incr_viewcount() paste.incr_viewcount()

View File

@ -91,7 +91,6 @@ INSTALLED_APPS = (
) )
PASTE = { PASTE = {
"has_title": False,
"has_meta_table": False, "has_meta_table": False,
"enabled_renderers": ["pygments", "raw"], "enabled_renderers": ["pygments", "raw"],
"default_renderer": "pygments", "default_renderer": "pygments",