Remove lifetime
This commit is contained in:
parent
d154339657
commit
a2dad29337
|
@ -1,7 +1,7 @@
|
||||||
from webtools import settings
|
from webtools import settings
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.forms import ModelForm, CharField
|
from django.forms import ModelForm, CharField
|
||||||
from .models import Paste, Language, EXPIRE_CHOICES
|
from .models import Paste, Language
|
||||||
|
|
||||||
|
|
||||||
class PasteForm(ModelForm):
|
class PasteForm(ModelForm):
|
||||||
|
|
|
@ -7,15 +7,6 @@ from django.utils.translation import gettext_lazy as _
|
||||||
import shortuuid
|
import shortuuid
|
||||||
|
|
||||||
|
|
||||||
EXPIRE_CHOICES = (
|
|
||||||
(0, _("Never expire")),
|
|
||||||
(60, _("1 hour")),
|
|
||||||
(60 * 24, _("1 day")),
|
|
||||||
(60 * 24 * 7, _("1 week")),
|
|
||||||
(60 * 24 * 7 * 30, _("1 month")),
|
|
||||||
(60 * 24 * 7 * 365, _("1 year")),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Language(models.Model):
|
class Language(models.Model):
|
||||||
"""Language object."""
|
"""Language object."""
|
||||||
|
|
|
@ -23,7 +23,6 @@ def index(request):
|
||||||
form = PasteForm(
|
form = PasteForm(
|
||||||
{
|
{
|
||||||
"language": language.id,
|
"language": language.id,
|
||||||
"lifetime": settings.PASTE["default_lifetime"],
|
|
||||||
"content": any_file.read().decode(),
|
"content": any_file.read().decode(),
|
||||||
},
|
},
|
||||||
instance=paste,
|
instance=paste,
|
||||||
|
@ -42,7 +41,6 @@ def index(request):
|
||||||
)
|
)
|
||||||
data["form"] = PasteForm(
|
data["form"] = PasteForm(
|
||||||
initial={
|
initial={
|
||||||
"lifetime": settings.PASTE["default_lifetime"],
|
|
||||||
"language": Language.by_name(settings.PASTE["default_language"]).id,
|
"language": Language.by_name(settings.PASTE["default_language"]).id,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
@ -95,7 +95,6 @@ PASTE = {
|
||||||
"enabled_renderers": ["pygments", "raw"],
|
"enabled_renderers": ["pygments", "raw"],
|
||||||
"default_renderer": "pygments",
|
"default_renderer": "pygments",
|
||||||
"max_characters": 100000,
|
"max_characters": 100000,
|
||||||
"default_lifetime": 60 * 24 * 7 * 365,
|
|
||||||
"default_language": "Python",
|
"default_language": "Python",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue