diff --git a/paste/fixtures/initial.json b/paste/fixtures/initial.json deleted file mode 100644 index 332a4e4..0000000 --- a/paste/fixtures/initial.json +++ /dev/null @@ -1 +0,0 @@ -[{"model": "paste.language", "pk": 1, "fields": {"name": "Bash (shell)", "slug": "bash"}}, {"model": "paste.language", "pk": 2, "fields": {"name": "C#", "slug": "csharp"}}, {"model": "paste.language", "pk": 3, "fields": {"name": "C", "slug": "c"}}, {"model": "paste.language", "pk": 4, "fields": {"name": "C++", "slug": "cpp"}}, {"model": "paste.language", "pk": 5, "fields": {"name": "CSS", "slug": "css"}}, {"model": "paste.language", "pk": 6, "fields": {"name": "Diff", "slug": "diff"}}, {"model": "paste.language", "pk": 7, "fields": {"name": "Go", "slug": "go"}}, {"model": "paste.language", "pk": 8, "fields": {"name": "HTML", "slug": "html"}}, {"model": "paste.language", "pk": 9, "fields": {"name": "Java", "slug": "java"}}, {"model": "paste.language", "pk": 10, "fields": {"name": "Javascript", "slug": "javascript"}}, {"model": "paste.language", "pk": 11, "fields": {"name": "Perl", "slug": "perl"}}, {"model": "paste.language", "pk": 12, "fields": {"name": "PHP", "slug": "php"}}, {"model": "paste.language", "pk": 13, "fields": {"name": "Plain text", "slug": "text"}}, {"model": "paste.language", "pk": 14, "fields": {"name": "Python", "slug": "python"}}, {"model": "paste.language", "pk": 15, "fields": {"name": "Ruby", "slug": "ruby"}}, {"model": "paste.language", "pk": 16, "fields": {"name": "SQL", "slug": "sql"}}, {"model": "paste.language", "pk": 17, "fields": {"name": "XML", "slug": "xml"}}, {"model": "paste.language", "pk": 18, "fields": {"name": "YAML", "slug": "yaml"}}] \ No newline at end of file diff --git a/paste/forms.py b/paste/forms.py index 423dfea..795fc38 100644 --- a/paste/forms.py +++ b/paste/forms.py @@ -1,7 +1,7 @@ from webtools import settings from django import forms from django.forms import ModelForm, CharField -from .models import Paste, Language +from .models import Paste class PasteForm(ModelForm): @@ -14,7 +14,7 @@ class PasteForm(ModelForm): class Meta: model = Paste fields = [ - "language", + "filename", "content", ] diff --git a/paste/migrations/0007_remove_paste_language_paste_filename_and_more.py b/paste/migrations/0007_remove_paste_language_paste_filename_and_more.py new file mode 100644 index 0000000..b34d824 --- /dev/null +++ b/paste/migrations/0007_remove_paste_language_paste_filename_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 4.2 on 2023-04-21 09:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("paste", "0006_remove_paste_title"), + ] + + operations = [ + migrations.RemoveField( + model_name="paste", + name="language", + ), + migrations.AddField( + model_name="paste", + name="filename", + field=models.CharField(default="", max_length=255), + ), + migrations.AlterField( + model_name="paste", + name="paste_time", + field=models.DateTimeField(auto_now_add=True), + ), + migrations.DeleteModel( + name="Language", + ), + ] diff --git a/paste/models.py b/paste/models.py index 13b391d..8cb079e 100644 --- a/paste/models.py +++ b/paste/models.py @@ -7,42 +7,16 @@ from django.utils.translation import gettext_lazy as _ import shortuuid - -class Language(models.Model): - """Language object.""" - - name = models.CharField(max_length=200, unique=True) - slug = models.SlugField(max_length=200, unique=True) - - @classmethod - def by_name(cls, name): - language = cls.objects.filter(name__icontains=name).first() - if not language: - language = cls.objects.filter( - name__iexact=settings.PASTE["default_language"] - ).first() - return language - - def __unicode__(self): - """String representation.""" - return _(self.name) - - def __str__(self): - return str(_(self.name)) - - class Paste(models.Model): """Paste object.""" - language = models.ForeignKey( - Language, default=14, on_delete=models.SET_NULL, null=True - ) + filename = models.CharField(max_length=255, default="") slug = models.SlugField(unique=True, editable=False) content = models.TextField( validators=[MaxLengthValidator(settings.PASTE["max_characters"])] ) size = models.IntegerField(default=0, editable=False) - paste_time = models.DateTimeField(default=datetime.now, editable=False) + paste_time = models.DateTimeField(auto_now_add=True) viewcount = models.IntegerField(default=0, editable=False) def compute_size(self): diff --git a/paste/templates/base.html b/paste/templates/base.html index a9fbffd..9694da1 100644 --- a/paste/templates/base.html +++ b/paste/templates/base.html @@ -3,18 +3,16 @@
- {% compress css %} {% endcompress %} {% block extrastyle %}{% endblock %} -