Privacy matters.
This commit is contained in:
parent
702f03a875
commit
194f7bb7e6
|
@ -4,4 +4,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', 'paste_ip')
|
list_display = ('paste_time', 'slug', 'title', 'viewcount')
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
# Generated by Django 2.0.5 on 2018-05-13 14:44
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('paste', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='paste',
|
||||||
|
name='paste_agent',
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='paste',
|
||||||
|
name='paste_ip',
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='paste',
|
||||||
|
name='language',
|
||||||
|
field=models.ForeignKey(default=14, null=True, on_delete=django.db.models.deletion.SET_NULL, to='paste.Language'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='paste',
|
||||||
|
name='lifecount',
|
||||||
|
field=models.IntegerField(blank=True, default=0),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='paste',
|
||||||
|
name='lifetime',
|
||||||
|
field=models.IntegerField(choices=[(0, 'Never expire'), (60, '1 hour'), (1440, '1 day'), (10080, '1 week'), (302400, '1 month'), (3679200, '1 year')], default=3679200),
|
||||||
|
),
|
||||||
|
]
|
|
@ -48,8 +48,6 @@ class Paste(models.Model):
|
||||||
settings.PASTE['max_characters'])])
|
settings.PASTE['max_characters'])])
|
||||||
size = models.IntegerField(default=0, editable=False)
|
size = models.IntegerField(default=0, editable=False)
|
||||||
paste_time = models.DateTimeField(default=datetime.now, editable=False)
|
paste_time = models.DateTimeField(default=datetime.now, editable=False)
|
||||||
paste_ip = models.GenericIPAddressField(editable=False)
|
|
||||||
paste_agent = models.CharField(max_length=200, editable=False)
|
|
||||||
lifetime = models.IntegerField(default=settings.PASTE['default_lifetime'],
|
lifetime = models.IntegerField(default=settings.PASTE['default_lifetime'],
|
||||||
choices=EXPIRE_CHOICES)
|
choices=EXPIRE_CHOICES)
|
||||||
lifecount = models.IntegerField(default=0, blank=True)
|
lifecount = models.IntegerField(default=0, blank=True)
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
<th>{% trans 'Language' %}</th>
|
<th>{% trans 'Language' %}</th>
|
||||||
<th>{% trans 'Size' %}</th>
|
<th>{% trans 'Size' %}</th>
|
||||||
<th>{% trans 'Paste time' %}</th>
|
<th>{% trans 'Paste time' %}</th>
|
||||||
<th>{% trans 'User IP' %}</th>
|
|
||||||
<th>{% trans 'Protection' %}</th>
|
<th>{% trans 'Protection' %}</th>
|
||||||
<th>{% trans 'Views' %}</th>
|
<th>{% trans 'Views' %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -25,7 +24,6 @@
|
||||||
<td>{% trans paste.language.name %}</td>
|
<td>{% trans paste.language.name %}</td>
|
||||||
<td>{{ paste.size }}</td>
|
<td>{{ paste.size }}</td>
|
||||||
<td>{{ paste.paste_time }}</td>
|
<td>{{ paste.paste_time }}</td>
|
||||||
<td>{{ paste.paste_ip }}</td>
|
|
||||||
<td>{% if paste.password %}<i class="icon-lock"> {% trans 'locked' %}</i>{% else %}<i class="icon-unlock"> {% trans 'open' %}</i>{% endif %}</td>
|
<td>{% if paste.password %}<i class="icon-lock"> {% trans 'locked' %}</i>{% else %}<i class="icon-unlock"> {% trans 'open' %}</i>{% endif %}</td>
|
||||||
<td>{{ paste.viewcount }}</td>
|
<td>{{ paste.viewcount }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
<th>{% trans 'Language' %}</th>
|
<th>{% trans 'Language' %}</th>
|
||||||
<th>{% trans 'Size' %}</th>
|
<th>{% trans 'Size' %}</th>
|
||||||
<th>{% trans 'Paste time' %}</th>
|
<th>{% trans 'Paste time' %}</th>
|
||||||
<th>{% trans 'User IP' %}</th>
|
|
||||||
<th>{% trans 'Visibility' %}</th>
|
<th>{% trans 'Visibility' %}</th>
|
||||||
<th>{% trans 'Protection' %}</th>
|
<th>{% trans 'Protection' %}</th>
|
||||||
<th>{% trans 'Views' %}</th>
|
<th>{% trans 'Views' %}</th>
|
||||||
|
@ -18,7 +17,6 @@
|
||||||
<td>{% trans paste.language.name %}</td>
|
<td>{% trans paste.language.name %}</td>
|
||||||
<td>{{ paste.size }}</td>
|
<td>{{ paste.size }}</td>
|
||||||
<td>{{ paste.paste_time }}</td>
|
<td>{{ paste.paste_time }}</td>
|
||||||
<td>{{ paste.paste_ip }}</td>
|
|
||||||
<td>{% if paste.private %}<i class="icon-eye-close"> {% trans 'private' %}</i>{% else %}<i class="icon-eye-open"> {% trans 'public' %}</i>{% endif %}</td>
|
<td>{% if paste.private %}<i class="icon-eye-close"> {% trans 'private' %}</i>{% else %}<i class="icon-eye-open"> {% trans 'public' %}</i>{% endif %}</td>
|
||||||
<td>{% if paste.password %}<i class="icon-lock"> {% trans 'locked' %}</i>{% else %}<i class="icon-unlock"> {% trans 'open' %}</i>{% endif %}</td>
|
<td>{% if paste.password %}<i class="icon-lock"> {% trans 'locked' %}</i>{% else %}<i class="icon-unlock"> {% trans 'open' %}</i>{% endif %}</td>
|
||||||
<td>{{ paste.viewcount }}{% if paste.lifecount > 0 %}/{{ paste.lifecount }}{% endif %}</td>
|
<td>{{ paste.viewcount }}{% if paste.lifecount > 0 %}/{{ paste.lifecount }}{% endif %}</td>
|
||||||
|
|
|
@ -14,10 +14,9 @@ def index(request):
|
||||||
"""Displays form."""
|
"""Displays form."""
|
||||||
data = {'menu': 'index',
|
data = {'menu': 'index',
|
||||||
'max_characters': settings.PASTE['max_characters']}
|
'max_characters': settings.PASTE['max_characters']}
|
||||||
|
# if request.method == 'PUT':
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
paste = Paste(slug=random_id(Paste),
|
paste = Paste(slug=random_id(Paste))
|
||||||
paste_ip=request.META['REMOTE_ADDR'],
|
|
||||||
paste_agent=request.META['HTTP_USER_AGENT'])
|
|
||||||
if request.FILES:
|
if request.FILES:
|
||||||
for language_name, any_file in request.FILES.items():
|
for language_name, any_file in request.FILES.items():
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in New Issue