1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00
This commit is contained in:
Nicolas Margulies 2022-09-28 12:50:11 +02:00
parent 977eb7c0d4
commit f099cbc879
3 changed files with 8 additions and 8 deletions

View File

@ -8,7 +8,6 @@ from django.contrib.auth import logout
from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.views import LoginView from django.contrib.auth.views import LoginView
from django.contrib.contenttypes.models import ContentType
from django.db import transaction from django.db import transaction
from django.db.models import Q, F from django.db.models import Q, F
from django.shortcuts import redirect from django.shortcuts import redirect

View File

@ -172,6 +172,7 @@ class TrustTable(tables.Table):
else '')}}, else '')}},
verbose_name=_("Delete"),) verbose_name=_("Delete"),)
class TrustedTable(tables.Table): class TrustedTable(tables.Table):
class Meta: class Meta:
attrs = { attrs = {
@ -184,7 +185,7 @@ class TrustedTable(tables.Table):
show_header = False show_header = False
trusting = tables.Column(attrs={ trusting = tables.Column(attrs={
'td': {'class': 'text-center', 'width':'100%'}}) 'td': {'class': 'text-center', 'width': '100%'}})
trust_back = tables.Column( trust_back = tables.Column(
verbose_name=_("Trust back"), verbose_name=_("Trust back"),
@ -200,7 +201,7 @@ class TrustedTable(tables.Table):
def render_trust_back(self, record): def render_trust_back(self, record):
user_note = record.trusted user_note = record.trusted
trusting_note = record.trusting trusting_note = record.trusting
if Trust.objects.filter(trusted=trusting_note, trusting=user_note) : if Trust.objects.filter(trusted=trusting_note, trusting=user_note):
return "" return ""
val = '<button id="' val = '<button id="'
val += str(record.pk) val += str(record.pk)

View File

@ -338,11 +338,11 @@ class SogeCredit(models.Model):
# if m.transaction not in self.transactions.all(): # if m.transaction not in self.transactions.all():
# self.transactions.add(m.transaction) # self.transactions.add(m.transaction)
# #
# if kfet_qs.exists(): # if kfet_qs.exists():
# m = kfet_qs.get() # m = kfet_qs.get()
# if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership # if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
# if m.transaction not in self.transactions.all(): # if m.transaction not in self.transactions.all():
# self.transactions.add(m.transaction) # self.transactions.add(m.transaction)
if 'wei' in settings.INSTALLED_APPS: if 'wei' in settings.INSTALLED_APPS:
from wei.models import WEIClub from wei.models import WEIClub