From 4ea2989f28f5ba0afd5eeaeb754d4f7bef089b23 Mon Sep 17 00:00:00 2001 From: Xavier Fiechter Date: Fri, 3 Feb 2023 13:36:42 +0100 Subject: [PATCH] . --- labelbase/models.py | 10 ++++------ labellabor/views.py | 12 +++++++----- templates/labelbase.html | 9 ++++++++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/labelbase/models.py b/labelbase/models.py index efc09ae..66e9fba 100644 --- a/labelbase/models.py +++ b/labelbase/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.contrib.auth.models import User +from django.contrib.auth.models import User import jsonfield @@ -16,7 +16,7 @@ class Labelbase(models.Model): blank=True ) about = models.CharField( - max_length=200, + max_length=200, default="", blank=True ) @@ -27,8 +27,8 @@ class Label(models.Model): TYPE_ADDR = 'addr' TYPE_PUBKEY = 'pubkey' TYPE_INPUT = 'input' - TYPE_OUTPUT = 'output' - TYPE_XPUT = 'xpub' + TYPE_OUTPUT = 'output' + TYPE_XPUT = 'xpub' TYPE_CHOICES = [ (TYPE_TX, 'tx'), @@ -55,5 +55,3 @@ class Label(models.Model): ) data = jsonfield.JSONField() labelbase = models.ForeignKey(Labelbase, on_delete=models.CASCADE) - - diff --git a/labellabor/views.py b/labellabor/views.py index 18daf4d..8913579 100644 --- a/labellabor/views.py +++ b/labellabor/views.py @@ -7,7 +7,7 @@ from django.views.generic.list import ListView from two_factor.views import OTPRequiredMixin from two_factor.views.utils import class_view_decorator -from labelbase.models import Label +from labelbase.models import Label, Labelbase class HomeView(TemplateView): template_name = 'home.html' @@ -15,13 +15,15 @@ class HomeView(TemplateView): class LabelbaseView(ListView): template_name = 'labelbase.html' - context_object_name = 'label_list' + context_object_name = 'label_list' def get_queryset(self): - labelbase_id = self.kwargs['labelbase_id'] - qs = Label.objects.filter(labelbase__user_id=self.request.user.id, labelbase_id=labelbase_id) + qs = Label.objects.filter(labelbase__user_id=self.request.user.id, labelbase_id=self.kwargs['labelbase_id']) return qs.order_by("-id") - + def get_context_data(self, **kwargs): + context = super(LabelbaseView, self).get_context_data(**kwargs) + context['labelbase'] = Label.objects.get(id=self.kwargs['labelbase_id'], user_id=self.request.user.id) + return context diff --git a/templates/labelbase.html b/templates/labelbase.html index 89501e1..0c9c5a5 100644 --- a/templates/labelbase.html +++ b/templates/labelbase.html @@ -5,11 +5,18 @@ + + +
-

{% block title %}LazyTiger {% endblock %}

+

{% block title %}{{ labelbase.name }} {% endblock %}

+ {{ labelbase.fingerprint }} + {% if about.about %} +

{{ about.about}}

+ {% endif %}